agora inbox for pgsql-hackers@postgresql.orghelp / color / mirror / Atom feed
[PATCH v7 14/15] WIP: Make UnlockReleaseBuffer() more efficient 107+ messages / 2 participants [nested] [flat]
* [PATCH v7 14/15] WIP: Make UnlockReleaseBuffer() more efficient @ 2025-11-19 20:32 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 107+ messages in thread From: Andres Freund @ 2025-11-19 20:32 UTC (permalink / raw) Now that the buffer content lock is implemented as part of BufferDesc.state, releasing the lock and unpinning the buffer can be implemented as a single atomic operation. Author: Reviewed-By: Discussion: https://postgr.es/m/ Backpatch: --- src/backend/access/nbtree/nbtpage.c | 22 +++++++++++- src/backend/storage/buffer/bufmgr.c | 52 ++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index 30b43a4dd18..2fd8141854c 100644 --- a/src/backend/access/nbtree/nbtpage.c +++ b/src/backend/access/nbtree/nbtpage.c @@ -1006,11 +1006,18 @@ _bt_relandgetbuf(Relation rel, Buffer obuf, BlockNumber blkno, int access) Assert(BlockNumberIsValid(blkno)); if (BufferIsValid(obuf)) + { + _bt_relbuf(rel, obuf); +#if 0 + Assert(BufferGetBlockNumber(obuf) != blkno); _bt_unlockbuf(rel, obuf); - buf = ReleaseAndReadBuffer(obuf, rel, blkno); +#endif + } + buf = ReadBuffer(rel, blkno); _bt_lockbuf(rel, buf, access); _bt_checkpage(rel, buf); + return buf; } @@ -1022,8 +1029,21 @@ _bt_relandgetbuf(Relation rel, Buffer obuf, BlockNumber blkno, int access) void _bt_relbuf(Relation rel, Buffer buf) { +#if 0 _bt_unlockbuf(rel, buf); ReleaseBuffer(buf); +#else + /* + * Buffer is pinned and locked, which means that it is expected to be + * defined and addressable. Check that proactively. + */ + VALGRIND_CHECK_MEM_IS_DEFINED(BufferGetPage(buf), BLCKSZ); + + UnlockReleaseBuffer(buf); + + if (!RelationUsesLocalBuffers(rel)) + VALGRIND_MAKE_MEM_NOACCESS(BufferGetPage(buf), BLCKSZ); +#endif } /* diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 7409c4e7e42..3437854e766 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -5494,13 +5494,63 @@ ReleaseBuffer(Buffer buffer) /* * UnlockReleaseBuffer -- release the content lock and pin on a buffer * - * This is just a shorthand for a common combination. + * This is just a, more efficient, shorthand for a common combination. */ void UnlockReleaseBuffer(Buffer buffer) { +#if 1 + int mode; + BufferDesc *buf; + PrivateRefCountEntry *ref; + uint64 sub; + uint64 lockstate; + + if (!BufferIsValid(buffer)) + elog(ERROR, "bad buffer ID: %d", buffer); + + if (BufferIsLocal(buffer)) + { + UnpinLocalBuffer(buffer); + return; + } + + ResourceOwnerForgetBuffer(CurrentResourceOwner, buffer); + + buf = GetBufferDescriptor(buffer - 1); + + mode = BufferLockDisownInternal(buffer, buf); + + /* compute state modification for lock release */ + sub = BufferLockReleaseSub(mode); + + /* compute state modification for pin release */ + ref = GetPrivateRefCountEntry(buffer, false); + Assert(ref != NULL); + Assert(ref->data.refcount > 0); + ref->data.refcount--; + + if (ref->data.refcount == 0) + { + sub |= BUF_REFCOUNT_ONE; + ForgetPrivateRefCountEntry(ref); + } + + /* perform the lock and pin release in one atomic op */ + lockstate = pg_atomic_sub_fetch_u64(&buf->state, sub); + + /* wake up waiters etc */ + BufferLockProcessRelease(buf, mode, lockstate); + + if (lockstate & BM_PIN_COUNT_WAITER) + WakePinCountWaiter(buf); + + RESUME_INTERRUPTS(); + +#else LockBuffer(buffer, BUFFER_LOCK_UNLOCK); ReleaseBuffer(buffer); +#endif } /* -- 2.48.1.76.g4e746b1a31.dirty --kad4mm4awdo7v2ki Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v7-0015-WIP-bufmgr-Don-t-copy-pages-while-writing-out.patch" ^ permalink raw reply [nested|flat] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ 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; 107+ 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] 107+ messages in thread
end of thread, other threads:[~2026-06-02 18:24 UTC | newest] Thread overview: 107+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2025-11-19 20:32 [PATCH v7 14/15] WIP: Make UnlockReleaseBuffer() more efficient Andres Freund <andres@anarazel.de> 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 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 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 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 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 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 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 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 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 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 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 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 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 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>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox