agora inbox for pgsql-hackers@postgresql.orghelp / color / mirror / Atom feed
[PATCH v43 4/7] Use BulkInsertState when copying data to the new heap. 324+ messages / 2 participants [nested] [flat]
* [PATCH v43 4/7] Use BulkInsertState when copying data to the new heap. @ 2026-03-11 14:20 Antonin Houska <ah@cybertec.at> 0 siblings, 0 replies; 324+ messages in thread From: Antonin Houska @ 2026-03-11 14:20 UTC (permalink / raw) It should make the copying more efficient. Besides that, buffer access strategy is involved this way. This diff reverts the changes done in previous parts of the series to reform_and_rewrite_tuple() and introduces a separate function heap_insert_for_repack(). --- src/backend/access/heap/heapam_handler.c | 110 +++++++++++++++-------- 1 file changed, 72 insertions(+), 38 deletions(-) diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c index 618b831e8eb..065bb233fe2 100644 --- a/src/backend/access/heap/heapam_handler.c +++ b/src/backend/access/heap/heapam_handler.c @@ -50,6 +50,11 @@ static void reform_and_rewrite_tuple(HeapTuple tuple, Relation OldHeap, Relation NewHeap, Datum *values, bool *isnull, RewriteState rwstate); +static void heap_insert_for_repack(HeapTuple tuple, Relation OldHeap, + Relation NewHeap, Datum *values, bool *isnull, + BulkInsertState bistate); +static HeapTuple reform_tuple(HeapTuple tuple, Relation OldHeap, + Relation NewHeap, Datum *values, bool *isnull); static bool SampleHeapTupleVisible(TableScanDesc scan, Buffer buffer, HeapTuple tuple, @@ -702,6 +707,7 @@ heapam_relation_copy_for_cluster(Relation OldHeap, Relation NewHeap, double *tups_recently_dead) { RewriteState rwstate = NULL; + BulkInsertState bistate = NULL; IndexScanDesc indexScan; TableScanDesc tableScan; HeapScanDesc heapScan; @@ -737,6 +743,8 @@ heapam_relation_copy_for_cluster(Relation OldHeap, Relation NewHeap, if (!concurrent) rwstate = begin_heap_rewrite(OldHeap, NewHeap, OldestXmin, *xid_cutoff, *multi_cutoff); + else + bistate = GetBulkInsertState(); /* Set up sorting if wanted */ @@ -966,8 +974,12 @@ heapam_relation_copy_for_cluster(Relation OldHeap, Relation NewHeap, }; int64 ct_val[2]; - reform_and_rewrite_tuple(tuple, OldHeap, NewHeap, - values, isnull, rwstate); + if (!concurrent) + reform_and_rewrite_tuple(tuple, OldHeap, NewHeap, + values, isnull, rwstate); + else + heap_insert_for_repack(tuple, OldHeap, NewHeap, + values, isnull, bistate); /* * In indexscan mode and also VACUUM FULL, report increase in @@ -1015,10 +1027,15 @@ heapam_relation_copy_for_cluster(Relation OldHeap, Relation NewHeap, break; n_tuples += 1; - reform_and_rewrite_tuple(tuple, - OldHeap, NewHeap, - values, isnull, - rwstate); + if (!concurrent) + reform_and_rewrite_tuple(tuple, + OldHeap, NewHeap, + values, isnull, + rwstate); + else + heap_insert_for_repack(tuple, OldHeap, NewHeap, + values, isnull, bistate); + /* Report n_tuples */ pgstat_progress_update_param(PROGRESS_REPACK_HEAP_TUPLES_INSERTED, n_tuples); @@ -1030,6 +1047,8 @@ heapam_relation_copy_for_cluster(Relation OldHeap, Relation NewHeap, /* Write out any remaining tuples, and fsync if needed */ if (rwstate) end_heap_rewrite(rwstate); + if (bistate) + FreeBulkInsertState(bistate); /* Clean up */ pfree(values); @@ -2422,56 +2441,71 @@ heapam_scan_sample_next_tuple(TableScanDesc scan, SampleScanState *scanstate, * SET WITHOUT OIDS. * * So, we must reconstruct the tuple from component Datums. - * - * If rwstate=NULL, use simple_heap_insert() instead of rewriting - in that - * case we still need to deform/form the tuple. TODO Shouldn't we rename the - * function, as might not do any rewrite? */ static void reform_and_rewrite_tuple(HeapTuple tuple, Relation OldHeap, Relation NewHeap, Datum *values, bool *isnull, RewriteState rwstate) +{ + HeapTuple copiedTuple; + + copiedTuple = reform_tuple(tuple, OldHeap, NewHeap, values, isnull); + + /* The heap rewrite module does the rest */ + rewrite_heap_tuple(rwstate, tuple, copiedTuple); + + heap_freetuple(copiedTuple); +} + +/* + * Insert tuple when processing REPACK CONCURRENTLY. + * + * rewriteheap.c is not used in the CONCURRENTLY case because it'd be + * difficult to do the same in the catch-up phase (as the logical + * decoding does not provide us with sufficient visibility + * information). Thus we must use heap_insert() both during the + * catch-up and here. + * + * We pass the NO_LOGICAL flag to heap_insert() in order to skip logical + * decoding: as soon as REPACK CONCURRENTLY swaps the relation files, it drops + * this relation, so no logical replication subscription should need the data. + * + * BulkInsertState is used because many tuples are inserted in the typical + * case. + */ +static void +heap_insert_for_repack(HeapTuple tuple, Relation OldHeap, Relation NewHeap, + Datum *values, bool *isnull, BulkInsertState bistate) +{ + tuple = reform_tuple(tuple, OldHeap, NewHeap, values, isnull); + + heap_insert(NewHeap, tuple, GetCurrentCommandId(true), + HEAP_INSERT_NO_LOGICAL, bistate); + + heap_freetuple(tuple); +} + +/* + * Deform tuple, set values of dropped columns to NULL, form a new tuple and + * return it. + */ +static HeapTuple +reform_tuple(HeapTuple tuple, Relation OldHeap, Relation NewHeap, + Datum *values, bool *isnull) { TupleDesc oldTupDesc = RelationGetDescr(OldHeap); TupleDesc newTupDesc = RelationGetDescr(NewHeap); - HeapTuple copiedTuple; int i; heap_deform_tuple(tuple, oldTupDesc, values, isnull); - /* Be sure to null out any dropped columns */ for (i = 0; i < newTupDesc->natts; i++) { if (TupleDescCompactAttr(newTupDesc, i)->attisdropped) isnull[i] = true; } - copiedTuple = heap_form_tuple(newTupDesc, values, isnull); - - if (rwstate) - /* The heap rewrite module does the rest */ - rewrite_heap_tuple(rwstate, tuple, copiedTuple); - else - { - /* - * Insert tuple when processing REPACK CONCURRENTLY. - * - * rewriteheap.c is not used in the CONCURRENTLY case because it'd be - * difficult to do the same in the catch-up phase (as the logical - * decoding does not provide us with sufficient visibility - * information). Thus we must use heap_insert() both during the - * catch-up and here. - * - * The following is like simple_heap_insert() except that we pass the - * flag to skip logical decoding: as soon as REPACK CONCURRENTLY swaps - * the relation files, it drops this relation, so no logical - * replication subscription should need the data. - */ - heap_insert(NewHeap, copiedTuple, GetCurrentCommandId(true), - HEAP_INSERT_NO_LOGICAL, NULL); - } - - heap_freetuple(copiedTuple); + return heap_form_tuple(newTupDesc, values, isnull); } /* -- 2.47.3 --nzintiedl6o4kcyp Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename="v43-0005-Fix-crash-caused-by-involuntary-decoding-of-unre.patch" ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
end of thread, other threads:[~2026-07-01 10:36 UTC | newest] Thread overview: 324+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2026-03-11 14:20 [PATCH v43 4/7] Use BulkInsertState when copying data to the new heap. Antonin Houska <ah@cybertec.at> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox