From: Andrey Borodin <x4mmm@yandex-team.ru>
Message-Id: <5AAA4DBE-4CC2-4D22-B138-BF2D48AE096F@yandex-team.ru>
Content-Type: multipart/mixed;
	boundary="Apple-Mail=_DA90EB9D-DE31-498D-B2EF-94C659006D3C"
Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3776.700.51.11.1\))
Subject: Re: Using Expanded Objects other than Arrays from plpgsql
Date: Mon, 3 Feb 2025 22:57:27 +0500
In-Reply-To: <412280.1738604208@sss.pgh.pa.us>
Cc: Pavel Borisov <pashkin.elfe@gmail.com>,
 Michel Pelletier <pelletier.michel@gmail.com>,
 Pavel Stehule <pavel.stehule@gmail.com>,
 pgsql-hackers@lists.postgresql.org
To: Tom Lane <tgl@sss.pgh.pa.us>
References: <CACxu=vJaKFNsYxooSnW1wEgsAO5u_v1XYBacfVJ14wgJV_PYeg@mail.gmail.com>
 <1342498.1729444411@sss.pgh.pa.us>
 <CACxu=vLXvpzN4X3k+9jsMt6ujuOvFVUSkA80t_cROSsF4y2jQQ@mail.gmail.com>
 <1445998.1729482404@sss.pgh.pa.us>
 <CACxu=vKEF8Qa-OaADFxf0uMg-xw6gH_CNCWd2s+xaqh-gY4=xg@mail.gmail.com>
 <2062830.1729625620@sss.pgh.pa.us> <2265411.1729699470@sss.pgh.pa.us>
 <CACxu=v++HNmss59yGUDkRny7g=M8tZ2YXF07AUXqKVGqcSfxGQ@mail.gmail.com>
 <2354718.1729737539@sss.pgh.pa.us> <2581216.1729794746@sss.pgh.pa.us>
 <CACxu=v+dn37zr8gx5xNP-EZY3OLtGLTHrbx_ZkCQc40HpyMLKA@mail.gmail.com>
 <1948345.1730500073@sss.pgh.pa.us>
 <CACxu=vL7i_U_iSNpREe8eCAMEyKHuPpk9THRpBhk+ar0U1EdOw@mail.gmail.com>
 <CACxu=vKLc6f5N8_DR58LKkE1eohWSxTvThTeGsLm7p7QH1aFBA@mail.gmail.com>
 <CACxu=vJf2S=ysun_h=zmYNu6oUM47+egbpX5mMC0X9BJK=EQwQ@mail.gmail.com>
 <CACxu=vK+S6BXN8ZYyBvqQBWrcwHXqtue1-ZuKO3+XtHGBYcDUQ@mail.gmail.com>
 <CAFj8pRCd6xcH-AYEyHFdGdU89O9JjZ-v-pyQnOwd9zNJkCEdhQ@mail.gmail.com>
 <3797606.1732045516@sss.pgh.pa.us> <CACxu=! ! !
 vJ1UeXPjPOzfT2E=tFpSCxPxcB7hgfqHYmefJWh3ZXPew@mail.gmail.com>
 <1417389.1736964543@sss.pgh.pa.us>
 <CACxu=vKModwqSpEjpn-ur1uMAEYkcd-i8CvNsH-z9=dk7F7YQw@mail.gmail.com>
 <3363452.1737483125@sss.pgh.pa.us>
 <0AC229FA-A3F1-43FD-B0DC-A46A73FEAFF7@yandex-team.ru>
 <931398.1737905825@sss.pgh.pa.us>
 <38A31221-C1C4-4846-9709-D66ACD76E87A@yandex-team.ru>
 <46876.1737918281@sss.pgh.pa.us>
 <CALT9ZEGy5+GNQUtR80BPL7k-Qi47sqwPLnN_dOaQUW5UbxcTGA@mail.gmail.com>
 <3682021.1738288421@sss.pgh.pa.us> <256915.1738533419@sss.pgh.pa.us>
 <932C9840-63D6-469D-9C65-1B1A14594D29@yandex-team.ru>
 <412280.1738604208@sss.pgh.pa.us>
Archived-At: <https://www.postgresql.org/message-id/5AAA4DBE-4CC2-4D22-B138-BF2D48AE096F%40yandex-team.ru>
Precedence: bulk


--Apple-Mail=_DA90EB9D-DE31-498D-B2EF-94C659006D3C
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii


> On 3 Feb 2025, at 22:36, Tom Lane <tgl@sss.pgh.pa.us> wrote:
>=20
> I'm not wedded to that name; do you have a better idea?

I'd propose something like attached. But feel free to ignore my =
suggestion: I do not understand context of these structure members.


Best regards, Andrey Borodin.

--Apple-Mail=_DA90EB9D-DE31-498D-B2EF-94C659006D3C
Content-Disposition: attachment;
	filename=rename.diff
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="rename.diff"
Content-Transfer-Encoding: 7bit

diff --git a/src/include/executor/execExpr.h b/src/include/executor/execExpr.h
index 191d8fe34d..594cdc2bcb 100644
--- a/src/include/executor/execExpr.h
+++ b/src/include/executor/execExpr.h
@@ -424,8 +424,8 @@ typedef struct ExprEvalStep
 		struct
 		{
 			ExecEvalSubroutine paramfunc;	/* add-on evaluation subroutine */
-			void	   *paramarg;	/* private data for same */
-			void	   *paramarg2;	/* more private data for same */
+			void	   *exprarg;	/* private data for PLpgSQL_expr* */
+			void	   *paramarg;	/* more private data for Param* */
 			int			paramid;	/* numeric ID for parameter */
 			Oid			paramtype;	/* OID of parameter's datatype */
 		}			cparam;
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index d4377ceecb..ddc8e511cc 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -6505,8 +6505,8 @@ plpgsql_param_compile(ParamListInfo params, Param *param,
 	 * pointers to the PLpgSQL_expr as well as this specific Param, to support
 	 * plpgsql_param_eval_var_check().
 	 */
-	scratch.d.cparam.paramarg = expr;
-	scratch.d.cparam.paramarg2 = param;
+	scratch.d.cparam.exprarg = expr;
+	scratch.d.cparam.paramarg = param;
 	scratch.d.cparam.paramid = param->paramid;
 	scratch.d.cparam.paramtype = param->paramtype;
 	ExprEvalPushStep(state, &scratch);
@@ -6550,8 +6550,8 @@ plpgsql_param_eval_var_check(ExprState *state, ExprEvalStep *op,
 	if (!var->isnull &&
 		VARATT_IS_EXTERNAL_EXPANDED_RW(DatumGetPointer(var->value)))
 	{
-		PLpgSQL_expr *expr = (PLpgSQL_expr *) op->d.cparam.paramarg;
-		Param	   *param = (Param *) op->d.cparam.paramarg2;
+		PLpgSQL_expr *expr = (PLpgSQL_expr *) op->d.cparam.exprarg;
+		Param	   *param = (Param *) op->d.cparam.paramarg;
 
 		/*
 		 * We might have already figured this out while evaluating some other

--Apple-Mail=_DA90EB9D-DE31-498D-B2EF-94C659006D3C--