MIME-Version: 1.0
References: 
 <CACJufxEN_mmgTtp-raJ9-VJHgyAGmb0SrO+01kn5by4mJ_XOfw@mail.gmail.com>
 <CACJufxGcUztOYcCj85o15YT68qPY3qpwUtdndqDgOs_Sps6Cow@mail.gmail.com>
 <de595a8e-2fc0-4931-94e5-3cb00d91d698@proxel.se>
In-Reply-To: <de595a8e-2fc0-4931-94e5-3cb00d91d698@proxel.se>
From: jian he <jian.universality@gmail.com>
Date: Wed, 1 Apr 2026 21:12:54 +0800
Message-ID: 
 <CACJufxFX_pTuBnQKoDP56ChcRiYdN+54KZnf99vo7MqVWrXmYw@mail.gmail.com>
Subject: Re: refactor ExecInitPartitionInfo
To: Andreas Karlsson <andreas@proxel.se>
Cc: PostgreSQL-development <pgsql-hackers@postgresql.org>
Content-Type: multipart/mixed; boundary="000000000000a687de064e65d991"
Archived-At: 
 <https://www.postgresql.org/message-id/CACJufxFX_pTuBnQKoDP56ChcRiYdN%2B54KZnf99vo7MqVWrXmYw%40mail.gmail.com>
Precedence: bulk

--000000000000a687de064e65d991
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Mon, Feb 23, 2026 at 10:28=E2=80=AFAM Andreas Karlsson <andreas@proxel.s=
e> wrote:
>
> >      if (node !=3D NULL)
> >          part_attmap =3D build_attrmap_by_name(RelationGetDescr(partrel=
),
> >                                              RelationGetDescr(firstResu=
ltRel),
> >                                              false);
> >
> > We have now consolidated five uses of build_attrmap_by_name into one.
>
> Hm, why would that be ok? As far as I can tell the current code tries
> hard to not build the attmap unless it is actually needed while you
> propose to build it almost unconditionally. While the code is less
> complicated with your patch it instead has to do more work in some
> cases, right?
>

Ok. I switched it back to

+    if (node &&
+        (node->withCheckOptionLists !=3D NIL ||
+         node->returningLists !=3D NIL ||
+         node->onConflictAction =3D=3D ONCONFLICT_UPDATE ||
+         node->onConflictWhere ||
+         node->operation =3D=3D CMD_MERGE))
+    {
+        /* later map_variable_attnos need use attribute map, build it now =
*/
+        part_attmap =3D build_attrmap_by_name(RelationGetDescr(partrel),
+                                            RelationGetDescr(firstResultRe=
l),
+                                            false);
+    }
+


--
jian
https://www.enterprisedb.com/

--000000000000a687de064e65d991
Content-Type: text/x-patch; charset="US-ASCII";
	name="v3-0001-refactor-ExecInitPartitionInfo.patch"
Content-Disposition: attachment;
	filename="v3-0001-refactor-ExecInitPartitionInfo.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_mng2fr9r0>
X-Attachment-Id: f_mng2fr9r0

RnJvbSA4MDk1MmViM2RmNTE4ZjhhMDFlYTI1NTcxMGY5ZDk2MGE0NTNlMDhhIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBqaWFuIGhlIDxqaWFuLnVuaXZlcnNhbGl0eUBnbWFpbC5jb20+
CkRhdGU6IFdlZCwgMSBBcHIgMjAyNiAyMTowNzo1NyArMDgwMApTdWJqZWN0OiBbUEFUQ0ggdjMg
MS8xXSByZWZhY3RvciBFeGVjSW5pdFBhcnRpdGlvbkluZm8KCk9wdGltaXplIEF0dHJNYXAgY3Jl
YXRpb24gaW4gRXhlY0luaXRQYXJ0aXRpb25JbmZvLiBTaW5jZSBtYXBfdmFyaWFibGVfYXR0bm9z
IGlzCmNhbGxlZCBtdWx0aXBsZSB0aW1lcyBhbmQgcmVxdWlyZXMgYW4gQXR0ck1hcCwgd2UgY2Fu
IGF2b2lkIHJlZHVuZGFudCB3b3JrIGJ5CmJ1aWxkaW5nIHRoZSBtYXAgb25jZSB3aXRoIGJ1aWxk
X2F0dHJtYXBfYnlfbmFtZSBhbmQgcmV1c2luZyBpdC4KCkRpc2N1c3Npb246IGh0dHBzOi8vcG9z
dGdyLmVzL20vQ0FDSnVmeEVOX21tZ1R0cC1yYUo5LVZKSGd5QUdtYjBTck8rMDFrbjVieTRtSl9Y
T2Z3QG1haWwuZ21haWwuY29tCmNvbW1pdGZlc3Q6IGh0dHBzOi8vY29tbWl0ZmVzdC5wb3N0Z3Jl
c3FsLm9yZy9wYXRjaC82MjgwCi0tLQogc3JjL2JhY2tlbmQvZXhlY3V0b3IvZXhlY1BhcnRpdGlv
bi5jIHwgNDAgKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE0
IGluc2VydGlvbnMoKyksIDI2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5k
L2V4ZWN1dG9yL2V4ZWNQYXJ0aXRpb24uYyBiL3NyYy9iYWNrZW5kL2V4ZWN1dG9yL2V4ZWNQYXJ0
aXRpb24uYwppbmRleCBkOTZkNGY5OTQ3Yi4uNzBmMjk5ZGEwMTkgMTAwNjQ0Ci0tLSBhL3NyYy9i
YWNrZW5kL2V4ZWN1dG9yL2V4ZWNQYXJ0aXRpb24uYworKysgYi9zcmMvYmFja2VuZC9leGVjdXRv
ci9leGVjUGFydGl0aW9uLmMKQEAgLTYwOCw2ICs2MDgsMTkgQEAgRXhlY0luaXRQYXJ0aXRpb25J
bmZvKE1vZGlmeVRhYmxlU3RhdGUgKm10c3RhdGUsIEVTdGF0ZSAqZXN0YXRlLAogCQkJCQkJKG5v
ZGUgIT0gTlVMTCAmJgogCQkJCQkJIG5vZGUtPm9uQ29uZmxpY3RBY3Rpb24gIT0gT05DT05GTElD
VF9OT05FKSk7CiAKKwlpZiAobm9kZSAmJgorCQkobm9kZS0+d2l0aENoZWNrT3B0aW9uTGlzdHMg
IT0gTklMIHx8CisJCSBub2RlLT5yZXR1cm5pbmdMaXN0cyAhPSBOSUwgfHwKKwkJIG5vZGUtPm9u
Q29uZmxpY3RBY3Rpb24gPT0gT05DT05GTElDVF9VUERBVEUgfHwKKwkJIG5vZGUtPm9uQ29uZmxp
Y3RXaGVyZSB8fAorCQkgbm9kZS0+b3BlcmF0aW9uID09IENNRF9NRVJHRSkpCisJeworCQkvKiBs
YXRlciBtYXBfdmFyaWFibGVfYXR0bm9zIG5lZWQgdXNlIGF0dHJpYnV0ZSBtYXAsIGJ1aWxkIGl0
IG5vdyAqLworCQlwYXJ0X2F0dG1hcCA9IGJ1aWxkX2F0dHJtYXBfYnlfbmFtZShSZWxhdGlvbkdl
dERlc2NyKHBhcnRyZWwpLAorCQkJCQkJCQkJCQlSZWxhdGlvbkdldERlc2NyKGZpcnN0UmVzdWx0
UmVsKSwKKwkJCQkJCQkJCQkJZmFsc2UpOworCX0KKwogCS8qCiAJICogQnVpbGQgV0lUSCBDSEVD
SyBPUFRJT04gY29uc3RyYWludHMgZm9yIHRoZSBwYXJ0aXRpb24uICBOb3RlIHRoYXQgd2UKIAkg
KiBkaWRuJ3QgYnVpbGQgdGhlIHdpdGhDaGVja09wdGlvbkxpc3QgZm9yIHBhcnRpdGlvbnMgd2l0
aGluIHRoZSBwbGFubmVyLApAQCAtNjUwLDEwICs2NjMsNiBAQCBFeGVjSW5pdFBhcnRpdGlvbklu
Zm8oTW9kaWZ5VGFibGVTdGF0ZSAqbXRzdGF0ZSwgRVN0YXRlICplc3RhdGUsCiAJCS8qCiAJCSAq
IENvbnZlcnQgVmFycyBpbiBpdCB0byBjb250YWluIHRoaXMgcGFydGl0aW9uJ3MgYXR0cmlidXRl
IG51bWJlcnMuCiAJCSAqLwotCQlwYXJ0X2F0dG1hcCA9Ci0JCQlidWlsZF9hdHRybWFwX2J5X25h
bWUoUmVsYXRpb25HZXREZXNjcihwYXJ0cmVsKSwKLQkJCQkJCQkJICBSZWxhdGlvbkdldERlc2Ny
KGZpcnN0UmVzdWx0UmVsKSwKLQkJCQkJCQkJICBmYWxzZSk7CiAJCXdjb0xpc3QgPSAoTGlzdCAq
KQogCQkJbWFwX3ZhcmlhYmxlX2F0dG5vcygoTm9kZSAqKSB3Y29MaXN0LAogCQkJCQkJCQlmaXJz
dFZhcm5vLCAwLApAQCAtNzEwLDExICs3MTksNiBAQCBFeGVjSW5pdFBhcnRpdGlvbkluZm8oTW9k
aWZ5VGFibGVTdGF0ZSAqbXRzdGF0ZSwgRVN0YXRlICplc3RhdGUsCiAJCS8qCiAJCSAqIENvbnZl
cnQgVmFycyBpbiBpdCB0byBjb250YWluIHRoaXMgcGFydGl0aW9uJ3MgYXR0cmlidXRlIG51bWJl
cnMuCiAJCSAqLwotCQlpZiAocGFydF9hdHRtYXAgPT0gTlVMTCkKLQkJCXBhcnRfYXR0bWFwID0K
LQkJCQlidWlsZF9hdHRybWFwX2J5X25hbWUoUmVsYXRpb25HZXREZXNjcihwYXJ0cmVsKSwKLQkJ
CQkJCQkJCSAgUmVsYXRpb25HZXREZXNjcihmaXJzdFJlc3VsdFJlbCksCi0JCQkJCQkJCQkgIGZh
bHNlKTsKIAkJcmV0dXJuaW5nTGlzdCA9IChMaXN0ICopCiAJCQltYXBfdmFyaWFibGVfYXR0bm9z
KChOb2RlICopIHJldHVybmluZ0xpc3QsCiAJCQkJCQkJCWZpcnN0VmFybm8sIDAsCkBAIC05NTIs
MTEgKzk1Niw3IEBAIEV4ZWNJbml0UGFydGl0aW9uSW5mbyhNb2RpZnlUYWJsZVN0YXRlICptdHN0
YXRlLCBFU3RhdGUgKmVzdGF0ZSwKIAkJCQkJTGlzdAkgICAqb25jb25mbGNvbHM7CiAKIAkJCQkJ
b25jb25mbHNldCA9IGNvcHlPYmplY3Qobm9kZS0+b25Db25mbGljdFNldCk7Ci0JCQkJCWlmIChw
YXJ0X2F0dG1hcCA9PSBOVUxMKQotCQkJCQkJcGFydF9hdHRtYXAgPQotCQkJCQkJCWJ1aWxkX2F0
dHJtYXBfYnlfbmFtZShSZWxhdGlvbkdldERlc2NyKHBhcnRyZWwpLAotCQkJCQkJCQkJCQkJICBS
ZWxhdGlvbkdldERlc2NyKGZpcnN0UmVzdWx0UmVsKSwKLQkJCQkJCQkJCQkJCSAgZmFsc2UpOwor
CiAJCQkJCW9uY29uZmxzZXQgPSAoTGlzdCAqKQogCQkJCQkJbWFwX3ZhcmlhYmxlX2F0dG5vcygo
Tm9kZSAqKSBvbmNvbmZsc2V0LAogCQkJCQkJCQkJCQlJTk5FUl9WQVIsIDAsCkBAIC0xMDA4LDEy
ICsxMDA4LDYgQEAgRXhlY0luaXRQYXJ0aXRpb25JbmZvKE1vZGlmeVRhYmxlU3RhdGUgKm10c3Rh
dGUsIEVTdGF0ZSAqZXN0YXRlLAogCQkJCXsKIAkJCQkJTGlzdAkgICAqY2xhdXNlOwogCi0JCQkJ
CWlmIChwYXJ0X2F0dG1hcCA9PSBOVUxMKQotCQkJCQkJcGFydF9hdHRtYXAgPQotCQkJCQkJCWJ1
aWxkX2F0dHJtYXBfYnlfbmFtZShSZWxhdGlvbkdldERlc2NyKHBhcnRyZWwpLAotCQkJCQkJCQkJ
CQkJICBSZWxhdGlvbkdldERlc2NyKGZpcnN0UmVzdWx0UmVsKSwKLQkJCQkJCQkJCQkJCSAgZmFs
c2UpOwotCiAJCQkJCWNsYXVzZSA9IGNvcHlPYmplY3QoKExpc3QgKikgbm9kZS0+b25Db25mbGlj
dFdoZXJlKTsKIAkJCQkJY2xhdXNlID0gKExpc3QgKikKIAkJCQkJCW1hcF92YXJpYWJsZV9hdHRu
b3MoKE5vZGUgKikgY2xhdXNlLApAQCAtMTA2NSwxMiArMTA1OSw2IEBAIEV4ZWNJbml0UGFydGl0
aW9uSW5mbyhNb2RpZnlUYWJsZVN0YXRlICptdHN0YXRlLCBFU3RhdGUgKmVzdGF0ZSwKIAkJRXhw
ckNvbnRleHQgKmVjb250ZXh0ID0gbXRzdGF0ZS0+cHMucHNfRXhwckNvbnRleHQ7CiAJCU5vZGUJ
ICAgKmpvaW5Db25kaXRpb247CiAKLQkJaWYgKHBhcnRfYXR0bWFwID09IE5VTEwpCi0JCQlwYXJ0
X2F0dG1hcCA9Ci0JCQkJYnVpbGRfYXR0cm1hcF9ieV9uYW1lKFJlbGF0aW9uR2V0RGVzY3IocGFy
dHJlbCksCi0JCQkJCQkJCQkgIFJlbGF0aW9uR2V0RGVzY3IoZmlyc3RSZXN1bHRSZWwpLAotCQkJ
CQkJCQkJICBmYWxzZSk7Ci0KIAkJaWYgKHVubGlrZWx5KCFsZWFmX3BhcnRfcnJpLT5yaV9wcm9q
ZWN0TmV3SW5mb1ZhbGlkKSkKIAkJCUV4ZWNJbml0TWVyZ2VUdXBsZVNsb3RzKG10c3RhdGUsIGxl
YWZfcGFydF9ycmkpOwogCi0tIAoyLjM0LjEKCg==
--000000000000a687de064e65d991--