agora inbox for pgsql-hackers@postgresql.org
help / color / mirror / Atom feedforeign.h is not installed
197+ messages / 4 participants
[nested] [flat]
* foreign.h is not installed
@ 2009-06-30 04:36 Itagaki Takahiro <itagaki.takahiro@oss.ntt.co.jp>
2009-06-30 06:51 ` Re: foreign.h is not installed Peter Eisentraut <peter_e@gmx.net>
2009-06-30 17:39 ` Re: foreign.h is not installed Tom Lane <tgl@sss.pgh.pa.us>
0 siblings, 2 replies; 197+ messages in thread
From: Itagaki Takahiro @ 2009-06-30 04:36 UTC (permalink / raw)
To: pgsql-hackers
Header file "include/foreign/foreign.h" is not installed in 8.4.0.
Did we forget to add subdir "foreign" to Makefile?
Index: src/include/Makefile
===================================================================
--- src/include/Makefile (8.4.0)
+++ src/include/Makefile (fixed)
@@ -17,7 +17,7 @@
# Subdirectories containing headers for server-side dev
-SUBDIRS = access bootstrap catalog commands executor lib libpq mb \
+SUBDIRS = access bootstrap catalog commands executor foreign lib libpq mb \
nodes optimizer parser postmaster regex rewrite storage tcop \
snowball snowball/libstemmer tsearch tsearch/dicts utils \
port port/win32 port/win32_msvc port/win32_msvc/sys \
Regards,
---
ITAGAKI Takahiro
NTT Open Source Software Center
^ permalink raw reply [nested|flat] 197+ messages in thread
* Re: foreign.h is not installed
2009-06-30 04:36 foreign.h is not installed Itagaki Takahiro <itagaki.takahiro@oss.ntt.co.jp>
@ 2009-06-30 06:51 ` Peter Eisentraut <peter_e@gmx.net>
1 sibling, 0 replies; 197+ messages in thread
From: Peter Eisentraut @ 2009-06-30 06:51 UTC (permalink / raw)
To: pgsql-hackers; +Cc: Itagaki Takahiro <itagaki.takahiro@oss.ntt.co.jp>
On Tuesday 30 June 2009 07:36:36 Itagaki Takahiro wrote:
> Header file "include/foreign/foreign.h" is not installed in 8.4.0.
>
> Did we forget to add subdir "foreign" to Makefile?
So it seems.
^ permalink raw reply [nested|flat] 197+ messages in thread
* Re: foreign.h is not installed
2009-06-30 04:36 foreign.h is not installed Itagaki Takahiro <itagaki.takahiro@oss.ntt.co.jp>
@ 2009-06-30 17:39 ` Tom Lane <tgl@sss.pgh.pa.us>
1 sibling, 0 replies; 197+ messages in thread
From: Tom Lane @ 2009-06-30 17:39 UTC (permalink / raw)
To: Itagaki Takahiro <itagaki.takahiro@oss.ntt.co.jp>; +Cc: pgsql-hackers
Itagaki Takahiro <itagaki.takahiro@oss.ntt.co.jp> writes:
> Header file "include/foreign/foreign.h" is not installed in 8.4.0.
> Did we forget to add subdir "foreign" to Makefile?
Applied, thanks.
regards, tom lane
^ permalink raw reply [nested|flat] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ 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; 197+ 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] 197+ messages in thread
end of thread, other threads:[~2026-06-02 18:24 UTC | newest]
Thread overview: 197+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2009-06-30 04:36 foreign.h is not installed Itagaki Takahiro <itagaki.takahiro@oss.ntt.co.jp>
2009-06-30 06:51 ` Peter Eisentraut <peter_e@gmx.net>
2009-06-30 17:39 ` Tom Lane <tgl@sss.pgh.pa.us>
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 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 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 v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH 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 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 v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH 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 v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH 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 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 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 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 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 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>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH 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 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 v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v3 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH v4 3/3] add helper functions for fast-path arg setup Reviewer <review@example.com>
2026-06-02 18:24 [PATCH 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 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 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 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 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>
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox