agora inbox for [email protected]  

help / color / mirror / Atom feed

[PATCH v27 2/9] Row pattern recognition patch (parse/analysis).
682+ messages / 2 participants
[nested] [flat]

* [PATCH v27 2/9] Row pattern recognition patch (parse/analysis).
@ 2024-12-30 23:53  Tatsuo Ishii <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Tatsuo Ishii @ 2024-12-30 23:53 UTC (permalink / raw)

---
 src/backend/parser/parse_agg.c    |   7 +
 src/backend/parser/parse_clause.c | 297 +++++++++++++++++++++++++++++-
 src/backend/parser/parse_expr.c   |   6 +
 src/backend/parser/parse_func.c   |   3 +
 4 files changed, 312 insertions(+), 1 deletion(-)

diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index 04b4596a65..6af3bcb375 100644
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -580,6 +580,10 @@ check_agglevels_and_constraints(ParseState *pstate, Node *expr)
 			errkind = true;
 			break;
 
+		case EXPR_KIND_RPR_DEFINE:
+			errkind = true;
+			break;
+
 			/*
 			 * There is intentionally no default: case here, so that the
 			 * compiler will warn if we add a new ParseExprKind without
@@ -970,6 +974,9 @@ transformWindowFuncCall(ParseState *pstate, WindowFunc *wfunc,
 		case EXPR_KIND_CYCLE_MARK:
 			errkind = true;
 			break;
+		case EXPR_KIND_RPR_DEFINE:
+			errkind = true;
+			break;
 
 			/*
 			 * There is intentionally no default: case here, so that the
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 979926b605..5a44c68b08 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -96,7 +96,14 @@ static WindowClause *findWindowClause(List *wclist, const char *name);
 static Node *transformFrameOffset(ParseState *pstate, int frameOptions,
 								  Oid rangeopfamily, Oid rangeopcintype, Oid *inRangeFunc,
 								  Node *clause);
-
+static void transformRPR(ParseState *pstate, WindowClause *wc, WindowDef *windef,
+						 List **targetlist);
+static List *transformDefineClause(ParseState *pstate, WindowClause *wc, WindowDef *windef,
+								   List **targetlist);
+static void transformPatternClause(ParseState *pstate, WindowClause *wc,
+								   WindowDef *windef);
+static List *transformMeasureClause(ParseState *pstate, WindowClause *wc,
+									WindowDef *windef);
 
 /*
  * transformFromClause -
@@ -2954,6 +2961,10 @@ transformWindowDefinitions(ParseState *pstate,
 											 rangeopfamily, rangeopcintype,
 											 &wc->endInRangeFunc,
 											 windef->endOffset);
+
+		/* Process Row Pattern Recognition related clauses */
+		transformRPR(pstate, wc, windef, targetlist);
+
 		wc->winref = winref;
 
 		result = lappend(result, wc);
@@ -3821,3 +3832,287 @@ transformFrameOffset(ParseState *pstate, int frameOptions,
 
 	return node;
 }
+
+/*
+ * transformRPR
+ *		Process Row Pattern Recognition related clauses
+ */
+static void
+transformRPR(ParseState *pstate, WindowClause *wc, WindowDef *windef,
+			 List **targetlist)
+{
+	/*
+	 * Window definition exists?
+	 */
+	if (windef == NULL)
+		return;
+
+	/*
+	 * Row Pattern Common Syntax clause exists?
+	 */
+	if (windef->rpCommonSyntax == NULL)
+		return;
+
+	/* Check Frame option. Frame must start at current row */
+	if ((wc->frameOptions & FRAMEOPTION_START_CURRENT_ROW) == 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_SYNTAX_ERROR),
+				 errmsg("FRAME must start at current row when row patttern recognition is used")));
+
+	/* Transform AFTER MACH SKIP TO clause */
+	wc->rpSkipTo = windef->rpCommonSyntax->rpSkipTo;
+
+	/* Transform AFTER MACH SKIP TO variable */
+	wc->rpSkipVariable = windef->rpCommonSyntax->rpSkipVariable;
+
+	/* Transform SEEK or INITIAL clause */
+	wc->initial = windef->rpCommonSyntax->initial;
+
+	/* Transform DEFINE clause into list of TargetEntry's */
+	wc->defineClause = transformDefineClause(pstate, wc, windef, targetlist);
+
+	/* Check PATTERN clause and copy to patternClause */
+	transformPatternClause(pstate, wc, windef);
+
+	/* Transform MEASURE clause */
+	transformMeasureClause(pstate, wc, windef);
+}
+
+/*
+ * transformDefineClause
+ *		Process DEFINE clause and transform ResTarget into list of
+ *		TargetEntry.
+ *
+ * XXX we only support column reference in row pattern definition search
+ * condition, e.g. "price". <row pattern definition variable name>.<column
+ * reference> is not supported, e.g. "A.price".
+ */
+static List *
+transformDefineClause(ParseState *pstate, WindowClause *wc, WindowDef *windef,
+					  List **targetlist)
+{
+	/* DEFINE variable name initials */
+	static char *defineVariableInitials = "abcdefghijklmnopqrstuvwxyz";
+
+	ListCell   *lc,
+			   *l;
+	ResTarget  *restarget,
+			   *r;
+	List	   *restargets;
+	List	   *defineClause;
+	char	   *name;
+	int			initialLen;
+	int			i;
+
+	/*
+	 * If Row Definition Common Syntax exists, DEFINE clause must exist. (the
+	 * raw parser should have already checked it.)
+	 */
+	Assert(windef->rpCommonSyntax->rpDefs != NULL);
+
+	/*
+	 * Check and add "A AS A IS TRUE" if pattern variable is missing in DEFINE
+	 * per the SQL standard.
+	 */
+	restargets = NIL;
+	foreach(lc, windef->rpCommonSyntax->rpPatterns)
+	{
+		A_Expr	   *a;
+		bool		found = false;
+
+		if (!IsA(lfirst(lc), A_Expr))
+			ereport(ERROR,
+					errmsg("node type is not A_Expr"));
+
+		a = (A_Expr *) lfirst(lc);
+		name = strVal(a->lexpr);
+
+		foreach(l, windef->rpCommonSyntax->rpDefs)
+		{
+			restarget = (ResTarget *) lfirst(l);
+
+			if (!strcmp(restarget->name, name))
+			{
+				found = true;
+				break;
+			}
+		}
+
+		if (!found)
+		{
+			/*
+			 * "name" is missing. So create "name AS name IS TRUE" ResTarget
+			 * node and add it to the temporary list.
+			 */
+			A_Const    *n;
+
+			restarget = makeNode(ResTarget);
+			n = makeNode(A_Const);
+			n->val.boolval.type = T_Boolean;
+			n->val.boolval.boolval = true;
+			n->location = -1;
+			restarget->name = pstrdup(name);
+			restarget->indirection = NIL;
+			restarget->val = (Node *) n;
+			restarget->location = -1;
+			restargets = lappend((List *) restargets, restarget);
+		}
+	}
+
+	if (list_length(restargets) >= 1)
+	{
+		/* add missing DEFINEs */
+		windef->rpCommonSyntax->rpDefs =
+			list_concat(windef->rpCommonSyntax->rpDefs, restargets);
+		list_free(restargets);
+	}
+
+	/*
+	 * Check for duplicate row pattern definition variables.  The standard
+	 * requires that no two row pattern definition variable names shall be
+	 * equivalent.
+	 */
+	restargets = NIL;
+	foreach(lc, windef->rpCommonSyntax->rpDefs)
+	{
+		restarget = (ResTarget *) lfirst(lc);
+		name = restarget->name;
+
+		/*
+		 * Add DEFINE expression (Restarget->val) to the targetlist as a
+		 * TargetEntry if it does not exist yet. Planner will add the column
+		 * ref var node to the outer plan's target list later on. This makes
+		 * DEFINE expression could access the outer tuple while evaluating
+		 * PATTERN.
+		 *
+		 * XXX: adding whole expressions of DEFINE to the plan.targetlist is
+		 * not so good, because it's not necessary to evalute the expression
+		 * in the target list while running the plan. We should extract the
+		 * var nodes only then add them to the plan.targetlist.
+		 */
+		findTargetlistEntrySQL99(pstate, (Node *) restarget->val,
+								 targetlist, EXPR_KIND_RPR_DEFINE);
+
+		/*
+		 * Make sure that the row pattern definition search condition is a
+		 * boolean expression.
+		 */
+		transformWhereClause(pstate, restarget->val,
+							 EXPR_KIND_RPR_DEFINE, "DEFINE");
+
+		foreach(l, restargets)
+		{
+			char	   *n;
+
+			r = (ResTarget *) lfirst(l);
+			n = r->name;
+
+			if (!strcmp(n, name))
+				ereport(ERROR,
+						(errcode(ERRCODE_SYNTAX_ERROR),
+						 errmsg("row pattern definition variable name \"%s\" appears more than once in DEFINE clause",
+								name),
+						 parser_errposition(pstate, exprLocation((Node *) r))));
+		}
+		restargets = lappend(restargets, restarget);
+	}
+	list_free(restargets);
+
+	/*
+	 * Create list of row pattern DEFINE variable name's initial. We assign
+	 * [a-z] to them (up to 26 variable names are allowed).
+	 */
+	restargets = NIL;
+	i = 0;
+	initialLen = strlen(defineVariableInitials);
+
+	foreach(lc, windef->rpCommonSyntax->rpDefs)
+	{
+		char		initial[2];
+
+		restarget = (ResTarget *) lfirst(lc);
+		name = restarget->name;
+
+		if (i >= initialLen)
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_SYNTAX_ERROR),
+					 errmsg("number of row pattern definition variable names exceeds %d",
+							initialLen),
+					 parser_errposition(pstate,
+										exprLocation((Node *) restarget))));
+		}
+		initial[0] = defineVariableInitials[i++];
+		initial[1] = '\0';
+		wc->defineInitial = lappend(wc->defineInitial,
+									makeString(pstrdup(initial)));
+	}
+
+	defineClause = transformTargetList(pstate, windef->rpCommonSyntax->rpDefs,
+									   EXPR_KIND_RPR_DEFINE);
+
+	/* mark column origins */
+	markTargetListOrigins(pstate, defineClause);
+
+	/* mark all nodes in the DEFINE clause tree with collation information */
+	assign_expr_collations(pstate, (Node *) defineClause);
+
+	return defineClause;
+}
+
+/*
+ * transformPatternClause
+ *		Process PATTERN clause and return PATTERN clause in the raw parse tree
+ */
+static void
+transformPatternClause(ParseState *pstate, WindowClause *wc,
+					   WindowDef *windef)
+{
+	ListCell   *lc;
+
+	/*
+	 * Row Pattern Common Syntax clause exists?
+	 */
+	if (windef->rpCommonSyntax == NULL)
+		return;
+
+	wc->patternVariable = NIL;
+	wc->patternRegexp = NIL;
+	foreach(lc, windef->rpCommonSyntax->rpPatterns)
+	{
+		A_Expr	   *a;
+		char	   *name;
+		char	   *regexp;
+
+		if (!IsA(lfirst(lc), A_Expr))
+			ereport(ERROR,
+					errmsg("node type is not A_Expr"));
+
+		a = (A_Expr *) lfirst(lc);
+		name = strVal(a->lexpr);
+
+		wc->patternVariable = lappend(wc->patternVariable, makeString(pstrdup(name)));
+		regexp = strVal(lfirst(list_head(a->name)));
+
+		wc->patternRegexp = lappend(wc->patternRegexp, makeString(pstrdup(regexp)));
+	}
+}
+
+/*
+ * transformMeasureClause
+ *		Process MEASURE clause
+ *	XXX MEASURE clause is not supported yet
+ */
+static List *
+transformMeasureClause(ParseState *pstate, WindowClause *wc,
+					   WindowDef *windef)
+{
+	if (windef->rowPatternMeasures == NIL)
+		return NIL;
+
+	ereport(ERROR,
+			(errcode(ERRCODE_SYNTAX_ERROR),
+			 errmsg("%s", "MEASURE clause is not supported yet"),
+			 parser_errposition(pstate, exprLocation((Node *) windef->rowPatternMeasures))));
+	return NIL;
+}
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index c2806297aa..e827c59fd4 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -575,6 +575,7 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref)
 		case EXPR_KIND_COPY_WHERE:
 		case EXPR_KIND_GENERATED_COLUMN:
 		case EXPR_KIND_CYCLE_MARK:
+		case EXPR_KIND_RPR_DEFINE:
 			/* okay */
 			break;
 
@@ -1858,6 +1859,9 @@ transformSubLink(ParseState *pstate, SubLink *sublink)
 		case EXPR_KIND_GENERATED_COLUMN:
 			err = _("cannot use subquery in column generation expression");
 			break;
+		case EXPR_KIND_RPR_DEFINE:
+			err = _("cannot use subquery in DEFINE expression");
+			break;
 
 			/*
 			 * There is intentionally no default: case here, so that the
@@ -3197,6 +3201,8 @@ ParseExprKindName(ParseExprKind exprKind)
 			return "GENERATED AS";
 		case EXPR_KIND_CYCLE_MARK:
 			return "CYCLE";
+		case EXPR_KIND_RPR_DEFINE:
+			return "DEFINE";
 
 			/*
 			 * There is intentionally no default: case here, so that the
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index 9b23344a3b..4c482abb30 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -2658,6 +2658,9 @@ check_srf_call_placement(ParseState *pstate, Node *last_srf, int location)
 		case EXPR_KIND_CYCLE_MARK:
 			errkind = true;
 			break;
+		case EXPR_KIND_RPR_DEFINE:
+			errkind = true;
+			break;
 
 			/*
 			 * There is intentionally no default: case here, so that the
-- 
2.25.1


----Next_Part(Tue_Dec_31_08_57_07_2024_963)--
Content-Type: Text/X-Patch; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="v27-0003-Row-pattern-recognition-patch-rewriter.patch"



^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread

* [PATCH v1 3/3] LO frontend PQexecParams
@ 2026-05-26 16:12  Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 682+ messages in thread

From: Nathan Bossart @ 2026-05-26 16:12 UTC (permalink / raw)

---
 src/interfaces/libpq/fe-connect.c |   1 -
 src/interfaces/libpq/fe-lobj.c    | 236 ++++--------------------------
 src/interfaces/libpq/libpq-int.h  |   1 -
 3 files changed, 26 insertions(+), 212 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 01c9735f276..9f6aa01dc0e 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -692,7 +692,6 @@ pqDropServerData(PGconn *conn)
 	conn->in_hot_standby = PG_BOOL_UNKNOWN;
 	conn->scram_sha_256_iterations = SCRAM_SHA_256_DEFAULT_ITERATIONS;
 	conn->sversion = 0;
-	conn->lobjprepared = false;
 
 	/* Reset assorted other per-connection state */
 	conn->last_sqlstate[0] = '\0';
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 41573c22c80..17c1d699a48 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -41,89 +41,6 @@
 
 #define LO_BUFSIZE		  8192
 
-typedef struct PGlobjfuncs
-{
-	char	   *name;
-	char	   *args;
-	int			nargs;
-	int			version;
-} PGlobjfuncs;
-
-static const PGlobjfuncs lobjfuncs[] =
-{
-	{
-		"lo_open",
-		"$1::pg_catalog.oid, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lo_close",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_creat",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_create",
-		"$1::pg_catalog.oid",
-		1,
-		80100
-	},
-	{
-		"lo_unlink",
-		"$1::pg_catalog.oid",
-		1
-	},
-	{
-		"lo_lseek",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4",
-		3
-	},
-	{
-		"lo_lseek64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4",
-		3,
-		90300
-	},
-	{
-		"lo_tell",
-		"$1::pg_catalog.int4",
-		1
-	},
-	{
-		"lo_tell64",
-		"$1::pg_catalog.int4",
-		1,
-		90300
-	},
-	{
-		"lo_truncate",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2,
-		80300
-	},
-	{
-		"lo_truncate64",
-		"$1::pg_catalog.int4, $2::pg_catalog.int8",
-		2,
-		90300
-	},
-	{
-		"loread",
-		"$1::pg_catalog.int4, $2::pg_catalog.int4",
-		2
-	},
-	{
-		"lowrite",
-		"$1::pg_catalog.int4, $2::pg_catalog.bytea",
-		2
-	}
-};
-
-static int	lo_initialize(PGconn *conn);
 static Oid	lo_import_internal(PGconn *conn, const char *filename, Oid oid);
 
 static bool
@@ -153,17 +70,14 @@ lo_open(PGconn *conn, Oid lobjId, int mode)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
 	mode = pg_hton32(mode);
 	argv[1] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_open", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_open($1::pg_catalog.oid, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(fd)))
 	{
@@ -194,14 +108,11 @@ lo_close(PGconn *conn, int fd)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_close", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_close($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -232,9 +143,6 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 80300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -263,8 +171,8 @@ lo_truncate(PGconn *conn, int fd, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_truncate", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -295,9 +203,6 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -311,8 +216,8 @@ lo_truncate64(PGconn *conn, int fd, int64_t len)
 	len = pg_hton64(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_truncate64", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_truncate64($1::pg_catalog.int4, $2::pg_catalog.int8)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -343,9 +248,6 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	int			argFormats[] = {1, 1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -364,8 +266,8 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len)
 	len = pg_hton32(len);
 	argv[1] = (char *) &len;
 
-	res = PQexecPrepared(conn, "libpq_internal_loread", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.loread($1::pg_catalog.int4, $2::pg_catalog.int4)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, -1))
 	{
@@ -401,9 +303,6 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	/*
 	 * Long ago, somebody thought it'd be a good idea to declare this function
 	 * as taking size_t ... but the underlying backend function only accepts a
@@ -421,8 +320,8 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
 
 	argv[1] = unconstify(char *, buf);
 
-	res = PQexecPrepared(conn, "libpq_internal_lowrite", 2,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lowrite($1::pg_catalog.int4, $2::pg_catalog.bytea)", 2, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -450,9 +349,6 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
@@ -462,8 +358,8 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "libpq_internal_lseek", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lseek($1::pg_catalog.int4, $2::pg_catalog.int4, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -491,9 +387,6 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	PGresult   *res;
 	int64		retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -510,8 +403,8 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence)
 	whence = pg_hton32(whence);
 	argv[2] = (char *) &whence;
 
-	res = PQexecPrepared(conn, "ligpq_internal_lo_lseek64", 3,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_lseek64($1::pg_catalog.int4, $2::pg_catalog.int8, $3::pg_catalog.int4)", 3, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
 		memcpy(&retval, PQgetvalue(res, 0, 0), sizeof(retval));
@@ -542,14 +435,11 @@ lo_creat(PGconn *conn, int mode)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	mode = pg_hton32(mode);
 	argv[0] = (char *) &mode;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_creat", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_creat($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -581,9 +471,6 @@ lo_create(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return InvalidOid;
-
 	if (PQserverVersion(conn) < 80100)
 	{
 		libpq_append_conn_error(conn, "server does not support function \"%s\"",
@@ -594,8 +481,8 @@ lo_create(PGconn *conn, Oid lobjId)
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_create", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_create($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -624,14 +511,11 @@ lo_tell(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -659,9 +543,6 @@ lo_tell64(PGconn *conn, int fd)
 	int			argFormats[] = {1};
 	PGresult   *res;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	if (PQserverVersion(conn) < 90300)
 	{
 		libpq_append_conn_error(conn, "server does not support functions \"%s\"",
@@ -672,8 +553,8 @@ lo_tell64(PGconn *conn, int fd)
 	fd = pg_hton32(fd);
 	argv[0] = (char *) &fd;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_tell64", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_tell64($1::pg_catalog.int4)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -702,14 +583,11 @@ lo_unlink(PGconn *conn, Oid lobjId)
 	PGresult   *res;
 	int			retval;
 
-	if (lo_initialize(conn) < 0)
-		return -1;
-
 	lobjId = pg_hton32(lobjId);
 	argv[0] = (char *) &lobjId;
 
-	res = PQexecPrepared(conn, "libpq_internal_lo_unlink", 1,
-						 (const char *const *) argv, argLens, argFormats, 1);
+	res = PQexecParams(conn, "SELECT pg_catalog.lo_unlink($1::pg_catalog.oid)", 1, NULL,
+					   (const char *const *) argv, argLens, argFormats, 1);
 
 	if (lo_result_is_valid(res, sizeof(retval)))
 	{
@@ -938,65 +816,3 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 
 	return result;
 }
-
-
-/*
- * lo_initialize
- *
- * Initialize for a new large-object operation on an existing connection.
- * Return 0 if OK, -1 on failure.
- *
- * If we haven't previously done so, we prepared statements for all the
- * functions that are required for large object operations.
- */
-static int
-lo_initialize(PGconn *conn)
-{
-	/* Nothing we can do with no connection */
-	if (conn == NULL)
-		return -1;
-
-	/* Since this is the beginning of a query cycle, reset the error state */
-	pqClearConnErrorState(conn);
-
-	/* Nothing else to do if we already prepared the statements */
-	if (conn->lobjprepared)
-		return 0;
-
-	for (int i = 0; i < lengthof(lobjfuncs); i++)
-	{
-		PGresult   *res;
-		ExecStatusType status;
-		PQExpBufferData pname;
-		PQExpBufferData pquery;
-
-		if (PQserverVersion(conn) < lobjfuncs[i].version)
-			continue;
-
-		initPQExpBuffer(&pname);
-		initPQExpBuffer(&pquery);
-
-		appendPQExpBuffer(&pname, "libpq_internal_%s",
-						  lobjfuncs[i].name);
-		appendPQExpBuffer(&pquery, "SELECT pg_catalog.%s(%s)",
-						  lobjfuncs[i].name, lobjfuncs[i].args);
-
-		res = PQprepare(conn, pname.data, pquery.data,
-						lobjfuncs[i].nargs, NULL);
-		status = PQresultStatus(res);
-		if (res)
-			PQclear(res);
-
-		termPQExpBuffer(&pname);
-		termPQExpBuffer(&pquery);
-
-		if (status == PGRES_COMMAND_OK)
-			continue;
-
-		libpq_append_conn_error(conn, "query to prepare large object statements failed");
-		return -1;
-	}
-
-	conn->lobjprepared = true;
-	return 0;
-}
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 9dd0f42b6b7..cf968f1519b 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -544,7 +544,6 @@ struct pg_conn
 	PGTernaryBool in_hot_standby;	/* in_hot_standby */
 	PGVerbosity verbosity;		/* error/notice message verbosity */
 	PGContextVisibility show_context;	/* whether to show CONTEXT field */
-	bool		lobjprepared;	/* whether LO statements have been prepared */
 	pg_prng_state prng_state;	/* prng state for load balancing connections */
 
 
-- 
2.50.1 (Apple Git-155)


--NDf4SqMA2rj1ZNJ4--





^ permalink  raw  reply  [nested|flat] 682+ messages in thread