agora inbox for pgsql-hackers@postgresql.orghelp / color / mirror / Atom feed
[PATCH v7 09/16] Make opp freeze heuristic compatible with prune+freeze record 97+ messages / 2 participants [nested] [flat]
* [PATCH v7 09/16] Make opp freeze heuristic compatible with prune+freeze record @ 2024-03-26 00:48 Melanie Plageman <melanieplageman@gmail.com> 0 siblings, 0 replies; 97+ messages in thread From: Melanie Plageman @ 2024-03-26 00:48 UTC (permalink / raw) Once the prune and freeze records are combined, we will no longer be able to use a test of whether or not pruning emitted an FPI to decide whether or not to opportunistically freeze a freezable page. While this heuristic should be improved, for now, approximate the previous logic by keeping track of whether or not a hint bit FPI was emitted during visibility checks (when checksums are on) and combine that with checking XLogCheckBufferNeedsBackup(). If we just finished deciding whether or not to prune and the current buffer seems to need an FPI after modification, it is likely that pruning would have emitted an FPI. --- src/backend/access/heap/pruneheap.c | 57 +++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c index e009c7579dd..d38de9b063d 100644 --- a/src/backend/access/heap/pruneheap.c +++ b/src/backend/access/heap/pruneheap.c @@ -247,6 +247,10 @@ heap_page_prune_and_freeze(Relation relation, Buffer buffer, TransactionId visibility_cutoff_xid; bool do_freeze; bool all_visible_except_removable; + bool do_prune; + bool whole_page_freezable; + bool hint_bit_fpi; + bool prune_fpi = false; int64 fpi_before = pgWalUsage.wal_fpi; /* @@ -456,6 +460,13 @@ heap_page_prune_and_freeze(Relation relation, Buffer buffer, } } + /* + * If checksums are enabled, heap_prune_satisfies_vacuum() may have caused + * an FPI to be emitted. Then reset fpi_before for no prune case. + */ + hint_bit_fpi = fpi_before != pgWalUsage.wal_fpi; + fpi_before = pgWalUsage.wal_fpi; + /* * For vacuum, if the whole page will become frozen, we consider * opportunistically freezing tuples. Dead tuples which will be removed by @@ -500,11 +511,41 @@ heap_page_prune_and_freeze(Relation relation, Buffer buffer, if (off_loc) *off_loc = InvalidOffsetNumber; + do_prune = prstate.nredirected > 0 || + prstate.ndead > 0 || + prstate.nunused > 0; + + /* + * Only incur overhead of checking if we will do an FPI if we might use + * the information. + */ + if (do_prune && pagefrz) + prune_fpi = XLogCheckBufferNeedsBackup(buffer); + + /* Is the whole page freezable? And is there something to freeze */ + whole_page_freezable = all_visible_except_removable && + presult->all_frozen; + + /* + * Freeze the page when heap_prepare_freeze_tuple indicates that at least + * one XID/MXID from before FreezeLimit/MultiXactCutoff is present. Also + * freeze when pruning generated an FPI, if doing so means that we set the + * page all-frozen afterwards (might not happen until final heap pass). + * XXX: Previously, we knew if pruning emitted an FPI by checking + * pgWalUsage.wal_fpi before and after pruning. Once the freeze and prune + * records are combined, this heuristic couldn't be used anymore. The + * opportunistic freeze heuristic must be improved; however, for now, try + * to approximate it. + */ + do_freeze = pagefrz && + (pagefrz->freeze_required || + (whole_page_freezable && presult->nfrozen > 0 && (prune_fpi || hint_bit_fpi))); + /* Any error while applying the changes is critical */ START_CRIT_SECTION(); /* Have we found any prunable items? */ - if (prstate.nredirected > 0 || prstate.ndead > 0 || prstate.nunused > 0) + if (do_prune) { /* * Apply the planned item changes, then repair page fragmentation, and @@ -569,20 +610,6 @@ heap_page_prune_and_freeze(Relation relation, Buffer buffer, /* Record number of newly-set-LP_DEAD items for caller */ presult->nnewlpdead = prstate.ndead; - /* - * Freeze the page when heap_prepare_freeze_tuple indicates that at least - * one XID/MXID from before FreezeLimit/MultiXactCutoff is present. Also - * freeze when pruning generated an FPI, if doing so means that we set the - * page all-frozen afterwards (might not happen until final heap pass). - */ - if (pagefrz) - do_freeze = pagefrz->freeze_required || - (all_visible_except_removable && presult->all_frozen && - presult->nfrozen > 0 && - fpi_before != pgWalUsage.wal_fpi); - else - do_freeze = false; - if (do_freeze) { TransactionId frz_conflict_horizon = InvalidTransactionId; -- 2.40.1 --ck6erxojvlx23byk Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v7-0010-Separate-tuple-pre-freeze-checks-and-invoke-earli.patch" ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v3 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 104 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 66 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..8802c6f8098 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,9 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +113,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +169,9 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +213,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +263,9 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +310,9 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +343,11 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; + lo_set_int_arg(&argv[1], offset); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +385,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +425,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +467,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +498,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +536,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +568,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --6CoALBM/+cswbGQ8-- ^ permalink raw reply [nested|flat] 97+ messages in thread
* [PATCH v4 3/3] add helper functions for fast-path arg setup @ 2026-06-02 18:24 Reviewer <review@example.com> 0 siblings, 0 replies; 97+ messages in thread From: Reviewer @ 2026-06-02 18:24 UTC (permalink / raw) --- src/interfaces/libpq/fe-lobj.c | 110 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 72 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 42b2a36bda9..e8f6d958e84 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -44,6 +44,22 @@ static int lo_initialize(PGconn *conn); static Oid lo_import_internal(PGconn *conn, const char *filename, Oid oid); +static inline void +lo_set_int_arg(PQArgBlock *arg, int value) +{ + arg->isint = 1; + arg->len = 4; + arg->u.integer = value; +} + +static inline void +lo_set_ptr_arg(PQArgBlock *arg, const void *ptr, int len) +{ + arg->isint = 0; + arg->len = len; + arg->u.ptr = (int *) unconstify(void *, ptr); +} + /* * lo_open * opens an existing large object @@ -62,13 +78,8 @@ lo_open(PGconn *conn, Oid lobjId, int mode) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = mode; + lo_set_int_arg(&argv[0], lobjId); + lo_set_int_arg(&argv[1], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_open, &fd, -1, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -101,9 +112,7 @@ lo_close(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_close, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -159,13 +168,8 @@ lo_truncate(PGconn *conn, int fd, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, -1, &result_len, 1, argv, 2); @@ -207,14 +211,10 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); len = pg_hton64(len); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + lo_set_ptr_arg(&argv[1], &len, 8); res = PQnfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, -1, &result_len, 1, argv, 2); @@ -261,13 +261,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = (int) len; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, len, &result_len, 0, argv, 2); @@ -312,13 +307,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 0; - argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + lo_set_int_arg(&argv[0], fd); + lo_set_ptr_arg(&argv[1], buf, (int) len); res = PQnfn(conn, conn->lobjfuncs->fn_lo_write, &retval, -1, &result_len, 1, argv, 2); @@ -349,17 +339,9 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; - - argv[1].isint = 1; - argv[1].len = 4; - argv[1].u.integer = offset; - - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[0], fd); + lo_set_int_arg(&argv[1], offset); + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, -1, &result_len, 1, argv, 3); @@ -397,18 +379,12 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); offset = pg_hton64(offset); - argv[1].isint = 0; - argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + lo_set_ptr_arg(&argv[1], &offset, 8); - argv[2].isint = 1; - argv[2].len = 4; - argv[2].u.integer = whence; + lo_set_int_arg(&argv[2], whence); res = PQnfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 3); @@ -443,9 +419,7 @@ lo_creat(PGconn *conn, int mode) if (lo_initialize(conn) < 0) return InvalidOid; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = mode; + lo_set_int_arg(&argv[0], mode); res = PQnfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -487,9 +461,7 @@ lo_create(PGconn *conn, Oid lobjId) return InvalidOid; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_create, &retval, -1, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -520,9 +492,7 @@ lo_tell(PGconn *conn, int fd) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, -1, &result_len, 1, argv, 1); @@ -560,9 +530,7 @@ lo_tell64(PGconn *conn, int fd) return -1; } - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = fd; + lo_set_int_arg(&argv[0], fd); res = PQnfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, sizeof(retval), &result_len, 0, argv, 1); @@ -594,9 +562,7 @@ lo_unlink(PGconn *conn, Oid lobjId) if (lo_initialize(conn) < 0) return -1; - argv[0].isint = 1; - argv[0].len = 4; - argv[0].u.integer = lobjId; + lo_set_int_arg(&argv[0], lobjId); res = PQnfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, -1, &result_len, 1, argv, 1); -- 2.50.1 (Apple Git-155) --Z10p9YYojB0/BzD2-- ^ permalink raw reply [nested|flat] 97+ messages in thread
end of thread, other threads:[~2026-06-02 18:24 UTC | newest] Thread overview: 97+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2024-03-26 00:48 [PATCH v7 09/16] Make opp freeze heuristic compatible with prune+freeze record Melanie Plageman <melanieplageman@gmail.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com> 2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox