agora inbox for pgsql-hackers@postgresql.orghelp / color / mirror / Atom feed
[PATCH v1 6/7] Row pattern recognition patch (tests). 324+ messages / 2 participants [nested] [flat]
* [PATCH v1 6/7] Row pattern recognition patch (tests). @ 2023-06-25 11:48 Tatsuo Ishii <ishii@postgresql.org> 0 siblings, 0 replies; 324+ messages in thread From: Tatsuo Ishii @ 2023-06-25 11:48 UTC (permalink / raw) --- src/test/regress/expected/rpr.out | 273 +++++++++++++++++++++++++++++ src/test/regress/parallel_schedule | 2 +- src/test/regress/sql/rpr.sql | 150 ++++++++++++++++ 3 files changed, 424 insertions(+), 1 deletion(-) create mode 100644 src/test/regress/expected/rpr.out create mode 100644 src/test/regress/sql/rpr.sql diff --git a/src/test/regress/expected/rpr.out b/src/test/regress/expected/rpr.out new file mode 100644 index 0000000000..9ede60ba39 --- /dev/null +++ b/src/test/regress/expected/rpr.out @@ -0,0 +1,273 @@ +-- +-- Test for row pattern definition clause +-- +CREATE TEMP TABLE stock ( + company TEXT, + tdate DATE, + price INTEGER + ); +INSERT INTO stock VALUES ('company1', '2023-07-01', 100); +INSERT INTO stock VALUES ('company1', '2023-07-02', 200); +INSERT INTO stock VALUES ('company1', '2023-07-03', 150); +INSERT INTO stock VALUES ('company1', '2023-07-04', 140); +INSERT INTO stock VALUES ('company1', '2023-07-05', 150); +INSERT INTO stock VALUES ('company1', '2023-07-06', 90); +INSERT INTO stock VALUES ('company1', '2023-07-07', 110); +INSERT INTO stock VALUES ('company1', '2023-07-08', 130); +INSERT INTO stock VALUES ('company1', '2023-07-09', 120); +INSERT INTO stock VALUES ('company1', '2023-07-10', 130); +INSERT INTO stock VALUES ('company2', '2023-07-01', 50); +INSERT INTO stock VALUES ('company2', '2023-07-02', 2000); +INSERT INTO stock VALUES ('company2', '2023-07-03', 1500); +INSERT INTO stock VALUES ('company2', '2023-07-04', 1400); +INSERT INTO stock VALUES ('company2', '2023-07-05', 1500); +INSERT INTO stock VALUES ('company2', '2023-07-06', 60); +INSERT INTO stock VALUES ('company2', '2023-07-07', 1100); +INSERT INTO stock VALUES ('company2', '2023-07-08', 1300); +INSERT INTO stock VALUES ('company2', '2023-07-09', 1200); +INSERT INTO stock VALUES ('company2', '2023-07-10', 1300); +SELECT * FROM stock; + company | tdate | price +----------+------------+------- + company1 | 07-01-2023 | 100 + company1 | 07-02-2023 | 200 + company1 | 07-03-2023 | 150 + company1 | 07-04-2023 | 140 + company1 | 07-05-2023 | 150 + company1 | 07-06-2023 | 90 + company1 | 07-07-2023 | 110 + company1 | 07-08-2023 | 130 + company1 | 07-09-2023 | 120 + company1 | 07-10-2023 | 130 + company2 | 07-01-2023 | 50 + company2 | 07-02-2023 | 2000 + company2 | 07-03-2023 | 1500 + company2 | 07-04-2023 | 1400 + company2 | 07-05-2023 | 1500 + company2 | 07-06-2023 | 60 + company2 | 07-07-2023 | 1100 + company2 | 07-08-2023 | 1300 + company2 | 07-09-2023 | 1200 + company2 | 07-10-2023 | 1300 +(20 rows) + +-- basic test using PREV +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + company | tdate | price | rpr +----------+------------+-------+------ + company1 | 07-01-2023 | 100 | 100 + company1 | 07-02-2023 | 200 | + company1 | 07-03-2023 | 150 | + company1 | 07-04-2023 | 140 | 140 + company1 | 07-05-2023 | 150 | + company1 | 07-06-2023 | 90 | 90 + company1 | 07-07-2023 | 110 | 110 + company1 | 07-08-2023 | 130 | + company1 | 07-09-2023 | 120 | + company1 | 07-10-2023 | 130 | + company2 | 07-01-2023 | 50 | 50 + company2 | 07-02-2023 | 2000 | + company2 | 07-03-2023 | 1500 | + company2 | 07-04-2023 | 1400 | 1400 + company2 | 07-05-2023 | 1500 | + company2 | 07-06-2023 | 60 | 60 + company2 | 07-07-2023 | 1100 | 1100 + company2 | 07-08-2023 | 1300 | + company2 | 07-09-2023 | 1200 | + company2 | 07-10-2023 | 1300 | +(20 rows) + +-- the first row start with less than or equal to 100 +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (LOWPRICE UP+ DOWN+) + DEFINE + LOWPRICE AS price <= 100, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + company | tdate | price | rpr +----------+------------+-------+----- + company1 | 07-01-2023 | 100 | 100 + company1 | 07-02-2023 | 200 | + company1 | 07-03-2023 | 150 | + company1 | 07-04-2023 | 140 | + company1 | 07-05-2023 | 150 | + company1 | 07-06-2023 | 90 | 90 + company1 | 07-07-2023 | 110 | + company1 | 07-08-2023 | 130 | + company1 | 07-09-2023 | 120 | + company1 | 07-10-2023 | 130 | + company2 | 07-01-2023 | 50 | 50 + company2 | 07-02-2023 | 2000 | + company2 | 07-03-2023 | 1500 | + company2 | 07-04-2023 | 1400 | + company2 | 07-05-2023 | 1500 | + company2 | 07-06-2023 | 60 | 60 + company2 | 07-07-2023 | 1100 | + company2 | 07-08-2023 | 1300 | + company2 | 07-09-2023 | 1200 | + company2 | 07-10-2023 | 1300 | +(20 rows) + +-- second row raises 120% +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (LOWPRICE UP+ DOWN+) + DEFINE + LOWPRICE AS price <= 100, + UP AS price > PREV(price) * 1.2, + DOWN AS price < PREV(price) +); + company | tdate | price | rpr +----------+------------+-------+----- + company1 | 07-01-2023 | 100 | 100 + company1 | 07-02-2023 | 200 | + company1 | 07-03-2023 | 150 | + company1 | 07-04-2023 | 140 | + company1 | 07-05-2023 | 150 | + company1 | 07-06-2023 | 90 | + company1 | 07-07-2023 | 110 | + company1 | 07-08-2023 | 130 | + company1 | 07-09-2023 | 120 | + company1 | 07-10-2023 | 130 | + company2 | 07-01-2023 | 50 | 50 + company2 | 07-02-2023 | 2000 | + company2 | 07-03-2023 | 1500 | + company2 | 07-04-2023 | 1400 | + company2 | 07-05-2023 | 1500 | + company2 | 07-06-2023 | 60 | + company2 | 07-07-2023 | 1100 | + company2 | 07-08-2023 | 1300 | + company2 | 07-09-2023 | 1200 | + company2 | 07-10-2023 | 1300 | +(20 rows) + +-- using NEXT +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UPDOWN) + DEFINE + START AS TRUE, + UPDOWN AS price > PREV(price) AND price > NEXT(price) +); + company | tdate | price | rpr +----------+------------+-------+------ + company1 | 07-01-2023 | 100 | 100 + company1 | 07-02-2023 | 200 | + company1 | 07-03-2023 | 150 | + company1 | 07-04-2023 | 140 | 140 + company1 | 07-05-2023 | 150 | + company1 | 07-06-2023 | 90 | + company1 | 07-07-2023 | 110 | 110 + company1 | 07-08-2023 | 130 | + company1 | 07-09-2023 | 120 | + company1 | 07-10-2023 | 130 | + company2 | 07-01-2023 | 50 | 50 + company2 | 07-02-2023 | 2000 | + company2 | 07-03-2023 | 1500 | + company2 | 07-04-2023 | 1400 | 1400 + company2 | 07-05-2023 | 1500 | + company2 | 07-06-2023 | 60 | + company2 | 07-07-2023 | 1100 | 1100 + company2 | 07-08-2023 | 1300 | + company2 | 07-09-2023 | 1200 | + company2 | 07-10-2023 | 1300 | +(20 rows) + +-- row pattern definition variable name must not appear more than once +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price), + UP AS price > PREV(price) +); +ERROR: row pattern definition variable name "up" appears more than once in DEFINE clause +LINE 9: UP AS price > PREV(price), + ^ +-- pattern variable name must appear in DEFINE +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+ END) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); +ERROR: syntax error at or near "END" +LINE 6: PATTERN (START UP+ DOWN+ END) + ^ +-- FRAME must start at current row when row patttern recognition is used +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); +ERROR: FRAME must start at current row when row patttern recognition is used +-- AFTER MATCH SKIP TO PAST LAST ROW is not supported +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + AFTER MATCH SKIP TO PAST LAST ROW + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); +ERROR: syntax error at or near "PAST" +LINE 5: AFTER MATCH SKIP TO PAST LAST ROW + ^ +-- SEEK is not supported +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + AFTER MATCH SKIP TO NEXT ROW + SEEK + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); +ERROR: SEEK is not supported +LINE 6: SEEK + ^ +HINT: Use INITIAL. diff --git a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule index cf46fa3359..ebb741318a 100644 --- a/src/test/regress/parallel_schedule +++ b/src/test/regress/parallel_schedule @@ -98,7 +98,7 @@ test: publication subscription # Another group of parallel tests # select_views depends on create_view # ---------- -test: select_views portals_p2 foreign_key cluster dependency guc bitmapops combocid tsearch tsdicts foreign_data window xmlmap functional_deps advisory_lock indirect_toast equivclass +test: select_views portals_p2 foreign_key cluster dependency guc bitmapops combocid tsearch tsdicts foreign_data window xmlmap functional_deps advisory_lock indirect_toast equivclass rpr # ---------- # Another group of parallel tests (JSON related) diff --git a/src/test/regress/sql/rpr.sql b/src/test/regress/sql/rpr.sql new file mode 100644 index 0000000000..921a9fcdfa --- /dev/null +++ b/src/test/regress/sql/rpr.sql @@ -0,0 +1,150 @@ +-- +-- Test for row pattern definition clause +-- + +CREATE TEMP TABLE stock ( + company TEXT, + tdate DATE, + price INTEGER + ); +INSERT INTO stock VALUES ('company1', '2023-07-01', 100); +INSERT INTO stock VALUES ('company1', '2023-07-02', 200); +INSERT INTO stock VALUES ('company1', '2023-07-03', 150); +INSERT INTO stock VALUES ('company1', '2023-07-04', 140); +INSERT INTO stock VALUES ('company1', '2023-07-05', 150); +INSERT INTO stock VALUES ('company1', '2023-07-06', 90); +INSERT INTO stock VALUES ('company1', '2023-07-07', 110); +INSERT INTO stock VALUES ('company1', '2023-07-08', 130); +INSERT INTO stock VALUES ('company1', '2023-07-09', 120); +INSERT INTO stock VALUES ('company1', '2023-07-10', 130); +INSERT INTO stock VALUES ('company2', '2023-07-01', 50); +INSERT INTO stock VALUES ('company2', '2023-07-02', 2000); +INSERT INTO stock VALUES ('company2', '2023-07-03', 1500); +INSERT INTO stock VALUES ('company2', '2023-07-04', 1400); +INSERT INTO stock VALUES ('company2', '2023-07-05', 1500); +INSERT INTO stock VALUES ('company2', '2023-07-06', 60); +INSERT INTO stock VALUES ('company2', '2023-07-07', 1100); +INSERT INTO stock VALUES ('company2', '2023-07-08', 1300); +INSERT INTO stock VALUES ('company2', '2023-07-09', 1200); +INSERT INTO stock VALUES ('company2', '2023-07-10', 1300); + +SELECT * FROM stock; + +-- basic test using PREV +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + +-- the first row start with less than or equal to 100 +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (LOWPRICE UP+ DOWN+) + DEFINE + LOWPRICE AS price <= 100, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + +-- second row raises 120% +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (LOWPRICE UP+ DOWN+) + DEFINE + LOWPRICE AS price <= 100, + UP AS price > PREV(price) * 1.2, + DOWN AS price < PREV(price) +); + +-- using NEXT +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UPDOWN) + DEFINE + START AS TRUE, + UPDOWN AS price > PREV(price) AND price > NEXT(price) +); + +-- row pattern definition variable name must not appear more than once +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price), + UP AS price > PREV(price) +); + +-- pattern variable name must appear in DEFINE +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+ END) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + +-- FRAME must start at current row when row patttern recognition is used +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + +-- AFTER MATCH SKIP TO PAST LAST ROW is not supported +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + AFTER MATCH SKIP TO PAST LAST ROW + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + +-- SEEK is not supported +SELECT company, tdate, price, rpr(price) OVER w FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + AFTER MATCH SKIP TO NEXT ROW + SEEK + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); -- 2.25.1 ----Next_Part(Sun_Jun_25_21_05_09_2023_126)---- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #undef SH_MAX_SIZE +#undef SH_CREATE_PARAMETERS /* types */ #undef SH_TYPE -- 2.53.0 --=-=-=-- ^ permalink raw reply [nested|flat] 324+ messages in thread
* [PATCH v1 2/2] Collapse SH_CREATE() into a single definition @ 2026-07-01 10:36 Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 0 siblings, 0 replies; 324+ messages in thread From: Jonathan Gonzalez V. @ 2026-07-01 10:36 UTC (permalink / raw) The function had two conditional definitions that make lcov v2.x fail. --- src/include/lib/simplehash.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 15af488abfb..cda4347e60b 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -138,6 +138,14 @@ #define SH_INSERT_HASH_INTERNAL SH_MAKE_NAME(insert_hash_internal) #define SH_LOOKUP_HASH_INTERNAL SH_MAKE_NAME(lookup_hash_internal) +#ifdef SH_RAW_ALLOCATOR +/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS uint32 nelements, void *private_data +#else +/* <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, void *private_data) */ +#define SH_CREATE_PARAMETERS MemoryContext ctx, uint32 nelements, void *private_data +#endif + /* generate forward declarations necessary to use the hash table */ #ifdef SH_DECLARE @@ -186,17 +194,7 @@ typedef struct SH_ITERATOR } SH_ITERATOR; /* externally visible function prototypes */ -#ifdef SH_RAW_ALLOCATOR -/* <prefix>_hash <prefix>_create(uint32 nelements, void *private_data) */ -SH_SCOPE SH_TYPE *SH_CREATE(uint32 nelements, void *private_data); -#else -/* - * <prefix>_hash <prefix>_create(MemoryContext ctx, uint32 nelements, - * void *private_data) - */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, - void *private_data); -#endif +SH_SCOPE SH_TYPE *SH_CREATE(SH_CREATE_PARAMETERS); /* void <prefix>_destroy(<prefix>_hash *tb) */ SH_SCOPE void SH_DESTROY(SH_TYPE * tb); @@ -442,13 +440,8 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -#ifdef SH_RAW_ALLOCATOR SH_SCOPE SH_TYPE * -SH_CREATE(uint32 nelements, void *private_data) -#else -SH_SCOPE SH_TYPE * -SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) -#endif +SH_CREATE(SH_CREATE_PARAMETERS) { SH_TYPE *tb; uint64 size; @@ -1217,6 +1210,7 @@ SH_STAT(SH_TYPE * tb) #undef SH_GROW_MAX_MOVE #undef SH_GROW_MIN_FILLFACTOR #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 -- 2023-06-25 11:48 [PATCH v1 6/7] Row pattern recognition patch (tests). Tatsuo Ishii <ishii@postgresql.org> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> 2026-07-01 10:36 [PATCH v1 2/2] Collapse SH_CREATE() into a single definition Jonathan Gonzalez V. <jonathan.abdiel@gmail.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