MIME-Version: 1.0
From: jian he <jian.universality@gmail.com>
Date: Fri, 28 Nov 2025 19:00:08 +0800
Message-ID: 
 <CACJufxEN_mmgTtp-raJ9-VJHgyAGmb0SrO+01kn5by4mJ_XOfw@mail.gmail.com>
Subject: refactor ExecInitPartitionInfo
To: PostgreSQL-development <pgsql-hackers@postgresql.org>
Content-Type: multipart/mixed; boundary="0000000000008978130644a58a74"
Archived-At: 
 <https://www.postgresql.org/message-id/CACJufxEN_mmgTtp-raJ9-VJHgyAGmb0SrO%2B01kn5by4mJ_XOfw%40mail.gmail.com>
Precedence: bulk

--0000000000008978130644a58a74
Content-Type: text/plain; charset="UTF-8"

hi.

I noticed the following code pattern repeated several times in
ExecInitPartitionInfo.
```
if (part_attmap == NULL)
            build_attrmap_by_name(RelationGetDescr(partrel),
                                  RelationGetDescr(firstResultRel),
                                  false);
```

we can consolidated into one, like:

+    if (node != NULL &&
+        (list_length(node->withCheckOptionLists) > 0 ||
+         list_length(node->returningLists) > 0 ||
+         node->onConflictAction != ONCONFLICT_NONE ||
+         node->operation == CMD_MERGE))
+    {
+        part_attmap =
+            build_attrmap_by_name(RelationGetDescr(partrel),
+                                  RelationGetDescr(firstResultRel),
+                                  false);
+    }
+

it matters, because nearby patch ON CONFLICT DO SELECT is= going to add another
one.

what do you think?

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

--0000000000008978130644a58a74
Content-Type: text/x-patch; charset="US-ASCII";
	name="v1-0001-refactor-ExecInitPartitionInfo.patch"
Content-Disposition: attachment;
	filename="v1-0001-refactor-ExecInitPartitionInfo.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_miiqvky00>
X-Attachment-Id: f_miiqvky00

RnJvbSAzMmM5MzIzYjY4ZmQ2YWJiNDVkYzBlZGVjMGE2NWE3ZGQwNzZjZWY3IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBqaWFuIGhlIDxqaWFuLnVuaXZlcnNhbGl0eUBnbWFpbC5jb20+
CkRhdGU6IEZyaSwgMjggTm92IDIwMjUgMTg6NTA6MzUgKzA4MDAKU3ViamVjdDogW1BBVENIIHYx
IDEvMV0gcmVmYWN0b3IgRXhlY0luaXRQYXJ0aXRpb25JbmZvCgpEaXNjdXNzaW9uOiBodHRwczov
L3Bvc3Rnci5lcy9tLwotLS0KIHNyYy9iYWNrZW5kL2V4ZWN1dG9yL2V4ZWNQYXJ0aXRpb24uYyB8
IDM2ICsrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMyBpbnNl
cnRpb25zKCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9leGVj
dXRvci9leGVjUGFydGl0aW9uLmMgYi9zcmMvYmFja2VuZC9leGVjdXRvci9leGVjUGFydGl0aW9u
LmMKaW5kZXggMGRjY2UxODFmMDkuLmY4NTVkMmMyMzVjIDEwMDY0NAotLS0gYS9zcmMvYmFja2Vu
ZC9leGVjdXRvci9leGVjUGFydGl0aW9uLmMKKysrIGIvc3JjL2JhY2tlbmQvZXhlY3V0b3IvZXhl
Y1BhcnRpdGlvbi5jCkBAIC01NDYsNiArNTQ2LDE4IEBAIEV4ZWNJbml0UGFydGl0aW9uSW5mbyhN
b2RpZnlUYWJsZVN0YXRlICptdHN0YXRlLCBFU3RhdGUgKmVzdGF0ZSwKIAkJCQkJCShub2RlICE9
IE5VTEwgJiYKIAkJCQkJCSBub2RlLT5vbkNvbmZsaWN0QWN0aW9uICE9IE9OQ09ORkxJQ1RfTk9O
RSkpOwogCisJaWYgKG5vZGUgIT0gTlVMTCAmJgorCQkobGlzdF9sZW5ndGgobm9kZS0+d2l0aENo
ZWNrT3B0aW9uTGlzdHMpID4gMCB8fAorCQkgbGlzdF9sZW5ndGgobm9kZS0+cmV0dXJuaW5nTGlz
dHMpID4gMCB8fAorCQkgbm9kZS0+b25Db25mbGljdEFjdGlvbiAhPSBPTkNPTkZMSUNUX05PTkUg
fHwKKwkJIG5vZGUtPm9wZXJhdGlvbiA9PSBDTURfTUVSR0UpKQorCXsKKwkJcGFydF9hdHRtYXAg
PQorCQkJYnVpbGRfYXR0cm1hcF9ieV9uYW1lKFJlbGF0aW9uR2V0RGVzY3IocGFydHJlbCksCisJ
CQkJCQkJCSAgUmVsYXRpb25HZXREZXNjcihmaXJzdFJlc3VsdFJlbCksCisJCQkJCQkJCSAgZmFs
c2UpOworCX0KKwogCS8qCiAJICogQnVpbGQgV0lUSCBDSEVDSyBPUFRJT04gY29uc3RyYWludHMg
Zm9yIHRoZSBwYXJ0aXRpb24uICBOb3RlIHRoYXQgd2UKIAkgKiBkaWRuJ3QgYnVpbGQgdGhlIHdp
dGhDaGVja09wdGlvbkxpc3QgZm9yIHBhcnRpdGlvbnMgd2l0aGluIHRoZSBwbGFubmVyLApAQCAt
NTg4LDEwICs2MDAsNiBAQCBFeGVjSW5pdFBhcnRpdGlvbkluZm8oTW9kaWZ5VGFibGVTdGF0ZSAq
bXRzdGF0ZSwgRVN0YXRlICplc3RhdGUsCiAJCS8qCiAJCSAqIENvbnZlcnQgVmFycyBpbiBpdCB0
byBjb250YWluIHRoaXMgcGFydGl0aW9uJ3MgYXR0cmlidXRlIG51bWJlcnMuCiAJCSAqLwotCQlw
YXJ0X2F0dG1hcCA9Ci0JCQlidWlsZF9hdHRybWFwX2J5X25hbWUoUmVsYXRpb25HZXREZXNjcihw
YXJ0cmVsKSwKLQkJCQkJCQkJICBSZWxhdGlvbkdldERlc2NyKGZpcnN0UmVzdWx0UmVsKSwKLQkJ
CQkJCQkJICBmYWxzZSk7CiAJCXdjb0xpc3QgPSAoTGlzdCAqKQogCQkJbWFwX3ZhcmlhYmxlX2F0
dG5vcygoTm9kZSAqKSB3Y29MaXN0LAogCQkJCQkJCQlmaXJzdFZhcm5vLCAwLApAQCAtNjQ1LDE0
ICs2NTMsNiBAQCBFeGVjSW5pdFBhcnRpdGlvbkluZm8oTW9kaWZ5VGFibGVTdGF0ZSAqbXRzdGF0
ZSwgRVN0YXRlICplc3RhdGUsCiAJCSAqLwogCQlyZXR1cm5pbmdMaXN0ID0gbGluaXRpYWwobm9k
ZS0+cmV0dXJuaW5nTGlzdHMpOwogCi0JCS8qCi0JCSAqIENvbnZlcnQgVmFycyBpbiBpdCB0byBj
b250YWluIHRoaXMgcGFydGl0aW9uJ3MgYXR0cmlidXRlIG51bWJlcnMuCi0JCSAqLwotCQlpZiAo
cGFydF9hdHRtYXAgPT0gTlVMTCkKLQkJCXBhcnRfYXR0bWFwID0KLQkJCQlidWlsZF9hdHRybWFw
X2J5X25hbWUoUmVsYXRpb25HZXREZXNjcihwYXJ0cmVsKSwKLQkJCQkJCQkJCSAgUmVsYXRpb25H
ZXREZXNjcihmaXJzdFJlc3VsdFJlbCksCi0JCQkJCQkJCQkgIGZhbHNlKTsKIAkJcmV0dXJuaW5n
TGlzdCA9IChMaXN0ICopCiAJCQltYXBfdmFyaWFibGVfYXR0bm9zKChOb2RlICopIHJldHVybmlu
Z0xpc3QsCiAJCQkJCQkJCWZpcnN0VmFybm8sIDAsCkBAIC03OTEsMTEgKzc5MSw3IEBAIEV4ZWNJ
bml0UGFydGl0aW9uSW5mbyhNb2RpZnlUYWJsZVN0YXRlICptdHN0YXRlLCBFU3RhdGUgKmVzdGF0
ZSwKIAkJCQkgKiB0YXJnZXQgcmVsYXRpb24gKGZpcnN0VmFybm8pLgogCQkJCSAqLwogCQkJCW9u
Y29uZmxzZXQgPSBjb3B5T2JqZWN0KG5vZGUtPm9uQ29uZmxpY3RTZXQpOwotCQkJCWlmIChwYXJ0
X2F0dG1hcCA9PSBOVUxMKQotCQkJCQlwYXJ0X2F0dG1hcCA9Ci0JCQkJCQlidWlsZF9hdHRybWFw
X2J5X25hbWUoUmVsYXRpb25HZXREZXNjcihwYXJ0cmVsKSwKLQkJCQkJCQkJCQkJICBSZWxhdGlv
bkdldERlc2NyKGZpcnN0UmVzdWx0UmVsKSwKLQkJCQkJCQkJCQkJICBmYWxzZSk7CisKIAkJCQlv
bmNvbmZsc2V0ID0gKExpc3QgKikKIAkJCQkJbWFwX3ZhcmlhYmxlX2F0dG5vcygoTm9kZSAqKSBv
bmNvbmZsc2V0LAogCQkJCQkJCQkJCUlOTkVSX1ZBUiwgMCwKQEAgLTg5MSwxMiArODg3LDYgQEAg
RXhlY0luaXRQYXJ0aXRpb25JbmZvKE1vZGlmeVRhYmxlU3RhdGUgKm10c3RhdGUsIEVTdGF0ZSAq
ZXN0YXRlLAogCQlFeHByQ29udGV4dCAqZWNvbnRleHQgPSBtdHN0YXRlLT5wcy5wc19FeHByQ29u
dGV4dDsKIAkJTm9kZQkgICAqam9pbkNvbmRpdGlvbjsKIAotCQlpZiAocGFydF9hdHRtYXAgPT0g
TlVMTCkKLQkJCXBhcnRfYXR0bWFwID0KLQkJCQlidWlsZF9hdHRybWFwX2J5X25hbWUoUmVsYXRp
b25HZXREZXNjcihwYXJ0cmVsKSwKLQkJCQkJCQkJCSAgUmVsYXRpb25HZXREZXNjcihmaXJzdFJl
c3VsdFJlbCksCi0JCQkJCQkJCQkgIGZhbHNlKTsKLQogCQlpZiAodW5saWtlbHkoIWxlYWZfcGFy
dF9ycmktPnJpX3Byb2plY3ROZXdJbmZvVmFsaWQpKQogCQkJRXhlY0luaXRNZXJnZVR1cGxlU2xv
dHMobXRzdGF0ZSwgbGVhZl9wYXJ0X3JyaSk7CiAKLS0gCjIuMzQuMQoK
--0000000000008978130644a58a74--