MIME-Version: 1.0
References: 
 <171085360143.2046436.7217841141682511557.pgcf@coridan.postgresql.org>
 <859476bf-3cb0-455e-b093-b8ab5ef17f0e@postgrespro.ru>
 <CA+TgmoZux8hzQ0=1-Rvigm9VuojW0aHiGSzL+G_g43qyrLGiSg@mail.gmail.com>
 <f56c654f-f152-4dc8-b221-4d4484bed612@postgrespro.ru>
 <CAPpHfdtXDuBaHscJn-wada6Kaf3fxmS4k-1TTVhpS+Kx=uveyw@mail.gmail.com>
 <4e2764f7-f6be-478f-8d7f-f921dbd10f5f@postgrespro.ru>
 <CAPpHfdv2V2tsvVn5LYyrJkzmPA==vbdCEKiT8j9yaaiDTfaQtA@mail.gmail.com>
 <ff30dc7e-ebca-42a2-9d49-a66c9a3c7ee5@postgrespro.ru>
 <CALDaNm3V5DQSbZGxhYH+3MMMm-YdgOg+RdJ-ni6D0TZx_=Xd7w@mail.gmail.com>
 <7fdaf3e8-4c05-4739-bee6-98acc068d1c7@postgrespro.ru>
 <CAPpHfduH83+CW1dBppFVjxauPFGC+-ux+Y7wB0koZJCs029SXA@mail.gmail.com>
 <4433b492-9e97-4334-96d9-ddaaa5083099@postgrespro.ru>
 <CACJufxEi_JVg+=_BSS0o+TYUE_Hq+jmga_yxxuKLSGbQiAnZDg@mail.gmail.com>
 <67ecf5fb-e63d-4284-be75-d0479eef81aa@postgrespro.ru>
 <CACJufxFGPLTDW55bgaBTH1uCf0=YUZUVKWFrTBvOZNYKc49MxA@mail.gmail.com>
 <b25b7142-91fd-41c8-a8d0-1ad7ad80f27f@postgrespro.ru>
 <CACJufxGZSsrRQnfp=T3t3wgisoouuA8pyW5SfWD1FTsW=x6JOg@mail.gmail.com>
In-Reply-To: 
 <CACJufxGZSsrRQnfp=T3t3wgisoouuA8pyW5SfWD1FTsW=x6JOg@mail.gmail.com>
From: jian he <jian.universality@gmail.com>
Date: Fri, 6 Jun 2025 15:13:22 +0800
Message-ID: 
 <CACJufxHBhjeXgG=d6h+cVcQLU-yif2FWGLypu-MUoyywDOEyKQ@mail.gmail.com>
Subject: Re: Add SPLIT PARTITION/MERGE PARTITIONS commands
To: Dmitry Koval <d.koval@postgrespro.ru>
Cc: pgsql-hackers@lists.postgresql.org
Content-Type: multipart/mixed; boundary="00000000000060cc9c0636e1f9b6"
Archived-At: 
 <https://www.postgresql.org/message-id/CACJufxHBhjeXgG%3Dd6h%2BcVcQLU-yif2FWGLypu-MUoyywDOEyKQ%40mail.gmail.com>
Precedence: bulk

--00000000000060cc9c0636e1f9b6
Content-Type: text/plain; charset="UTF-8"

hi.

in createTableConstraints
+ /* Add a pre-cooked default expression. */
+ StoreAttrDefault(newRel, num, def, true);
+
+ /* Store CHECK constraints. */
+ StoreConstraints(newRel, cookedConstraints, false);
Here, StoreConstraints last argument should be set to true?
see also StoreAttrDefault.


+static void
+createTableConstraints(Relation modelRel, Relation newRel)
+ /*
+ * Construct a map from the LIKE relation's attnos to the child rel's.
+ * This re-checks type match etc, although it shouldn't be possible to
+ * have a failure since both tables are locked.
+ */
+ attmap = build_attrmap_by_name(RelationGetDescr(newRel),
+   tupleDesc,
+   false);
+
+ /* Cycle for default values. */
+ for (parent_attno = 1; parent_attno <= tupleDesc->natts; parent_attno++)
+ {
+ Form_pg_attribute attribute = TupleDescAttr(tupleDesc,
+ parent_attno - 1);
+
+ /* Ignore dropped columns in the parent. */
+ if (attribute->attisdropped)
+ continue;
+
+ /* Copy default, if present and it should be copied. */
+ if (attribute->atthasdef)
+ {
+ Node   *this_default = NULL;
+ AttrDefault *attrdef = constr->defval;
+ bool found_whole_row;
+ int16 num;
+ Node   *def;
+
+ /* Find default in constraint structure */
+ for (int i = 0; i < constr->num_defval; i++)
+ {
+ if (attrdef[i].adnum == parent_attno)
+ {
+ this_default = stringToNode(attrdef[i].adbin);
+ break;
+ }
+ }
+ if (this_default == NULL)
+ elog(ERROR, "default expression not found for attribute %d of
relation \"%s\"",
+ parent_attno, RelationGetRelationName(modelRel));
you can use TupleDescGetDefault, build_generation_expression
to simplify the above code.

The attached patch fixes the above issues.
it is based on v41-0001-Implement-ALTER-TABLE-.-MERGE-PARTITIONS-.-comma.patch
----------------------
Do getAttributesList need to care about pg_attribute.attidentity?
currently MERGE PARTITION seems to work fine with identity columns,
this issue i didn't dig deeper.

I am wondering right after createPartitionTable,
do we need a CommandCounterIncrement?
because later moveMergedTablesRows will use the output of createPartitionTable.

--00000000000060cc9c0636e1f9b6
Content-Type: application/octet-stream;
	name="v41-0001-misc-fixes-in-createTableConstraints.no-cfbot"
Content-Disposition: attachment;
	filename="v41-0001-misc-fixes-in-createTableConstraints.no-cfbot"
Content-Transfer-Encoding: base64
Content-ID: <f_mbkgv6y40>
X-Attachment-Id: f_mbkgv6y40

RnJvbSBiYzk3MWNlNmE4Y2NmMTdiZTlkYmYyY2FlYzM2ZWRmNTQ5ZjY2YjJmIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBqaWFuIGhlIDxqaWFuLnVuaXZlcnNhbGl0eUBnbWFpbC5jb20+
CkRhdGU6IEZyaSwgNiBKdW4gMjAyNSAxNTowNzozMiArMDgwMApTdWJqZWN0OiBbUEFUQ0ggdjQx
IDEvMV0gbWlzYyBmaXhlcyBpbiBjcmVhdGVUYWJsZUNvbnN0cmFpbnRzCgotLS0KIHNyYy9iYWNr
ZW5kL2NvbW1hbmRzL3RhYmxlY21kcy5jIHwgMjQgKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiAx
IGZpbGUgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0t
Z2l0IGEvc3JjL2JhY2tlbmQvY29tbWFuZHMvdGFibGVjbWRzLmMgYi9zcmMvYmFja2VuZC9jb21t
YW5kcy90YWJsZWNtZHMuYwppbmRleCA3MGU3NmM2NzdjOC4uODRkOTYxYzBlMmQgMTAwNjQ0Ci0t
LSBhL3NyYy9iYWNrZW5kL2NvbW1hbmRzL3RhYmxlY21kcy5jCisrKyBiL3NyYy9iYWNrZW5kL2Nv
bW1hbmRzL3RhYmxlY21kcy5jCkBAIC0yMjE2OSwyMyArMjIxNjksMTkgQEAgY3JlYXRlVGFibGVD
b25zdHJhaW50cyhSZWxhdGlvbiBtb2RlbFJlbCwgUmVsYXRpb24gbmV3UmVsKQogCQlpZiAoYXR0
cmlidXRlLT5hdHRoYXNkZWYpCiAJCXsKIAkJCU5vZGUJICAgKnRoaXNfZGVmYXVsdCA9IE5VTEw7
Ci0JCQlBdHRyRGVmYXVsdCAqYXR0cmRlZiA9IGNvbnN0ci0+ZGVmdmFsOwogCQkJYm9vbAkJZm91
bmRfd2hvbGVfcm93OwotCQkJaW50MTYJCW51bTsKKwkJCUF0dHJOdW1iZXIJbnVtOwogCQkJTm9k
ZQkgICAqZGVmOwogCi0JCQkvKiBGaW5kIGRlZmF1bHQgaW4gY29uc3RyYWludCBzdHJ1Y3R1cmUg
Ki8KLQkJCWZvciAoaW50IGkgPSAwOyBpIDwgY29uc3RyLT5udW1fZGVmdmFsOyBpKyspCisJCQlp
ZiAoYXR0cmlidXRlLT5hdHRnZW5lcmF0ZWQgPT0gQVRUUklCVVRFX0dFTkVSQVRFRF9WSVJUVUFM
KQorCQkJCXRoaXNfZGVmYXVsdCA9IGJ1aWxkX2dlbmVyYXRpb25fZXhwcmVzc2lvbihtb2RlbFJl
bCwgYXR0cmlidXRlLT5hdHRudW0pOworCQkJZWxzZQogCQkJewotCQkJCWlmIChhdHRyZGVmW2ld
LmFkbnVtID09IHBhcmVudF9hdHRubykKLQkJCQl7Ci0JCQkJCXRoaXNfZGVmYXVsdCA9IHN0cmlu
Z1RvTm9kZShhdHRyZGVmW2ldLmFkYmluKTsKLQkJCQkJYnJlYWs7Ci0JCQkJfQorCQkJCXRoaXNf
ZGVmYXVsdCA9IFR1cGxlRGVzY0dldERlZmF1bHQodHVwbGVEZXNjLCBhdHRyaWJ1dGUtPmF0dG51
bSk7CisJCQkJaWYgKHRoaXNfZGVmYXVsdCA9PSBOVUxMKQorCQkJCQllbG9nKEVSUk9SLCAiZGVm
YXVsdCBleHByZXNzaW9uIG5vdCBmb3VuZCBmb3IgYXR0cmlidXRlICVkIG9mIHJlbGF0aW9uIFwi
JXNcIiIsCisJCQkJCQkgYXR0cmlidXRlLT5hdHRudW0sIFJlbGF0aW9uR2V0UmVsYXRpb25OYW1l
KG1vZGVsUmVsKSk7CiAJCQl9Ci0JCQlpZiAodGhpc19kZWZhdWx0ID09IE5VTEwpCi0JCQkJZWxv
ZyhFUlJPUiwgImRlZmF1bHQgZXhwcmVzc2lvbiBub3QgZm91bmQgZm9yIGF0dHJpYnV0ZSAlZCBv
ZiByZWxhdGlvbiBcIiVzXCIiLAotCQkJCQkgcGFyZW50X2F0dG5vLCBSZWxhdGlvbkdldFJlbGF0
aW9uTmFtZShtb2RlbFJlbCkpOwogCiAJCQludW0gPSBhdHRtYXAtPmF0dG51bXNbcGFyZW50X2F0
dG5vIC0gMV07CiAJCQlkZWYgPSBtYXBfdmFyaWFibGVfYXR0bm9zKHRoaXNfZGVmYXVsdCwgMSwg
MCwgYXR0bWFwLCBJbnZhbGlkT2lkLCAmZm91bmRfd2hvbGVfcm93KTsKQEAgLTIyMTk1LDcgKzIy
MTkxLDcgQEAgY3JlYXRlVGFibGVDb25zdHJhaW50cyhSZWxhdGlvbiBtb2RlbFJlbCwgUmVsYXRp
b24gbmV3UmVsKQogCQkJICogdGhhdCBkZWZhdWx0cyBjYW5ub3QgY29udGFpbiBhbnkgdmFycywg
c28gaXQncyBPSyB0aGF0IHRoZQogCQkJICogZXJyb3IgbWVzc2FnZSByZWZlcnMgdG8gZ2VuZXJh
dGVkIGNvbHVtbnMuCiAJCQkgKi8KLQkJCWlmIChmb3VuZF93aG9sZV9yb3cpCisJCQlpZiAoZm91
bmRfd2hvbGVfcm93ICYmIGF0dHJpYnV0ZS0+YXR0Z2VuZXJhdGVkICE9ICdcMCcpCiAJCQkJZXJl
cG9ydChFUlJPUiwKIAkJCQkJCWVycmNvZGUoRVJSQ09ERV9GRUFUVVJFX05PVF9TVVBQT1JURUQp
LAogCQkJCQkJZXJybXNnKCJjYW5ub3QgY29udmVydCB3aG9sZS1yb3cgdGFibGUgcmVmZXJlbmNl
IiksCkBAIC0yMjI1Myw3ICsyMjI0OSw3IEBAIGNyZWF0ZVRhYmxlQ29uc3RyYWludHMoUmVsYXRp
b24gbW9kZWxSZWwsIFJlbGF0aW9uIG5ld1JlbCkKIAl9CiAKIAkvKiBTdG9yZSBDSEVDSyBjb25z
dHJhaW50cy4gKi8KLQlTdG9yZUNvbnN0cmFpbnRzKG5ld1JlbCwgY29va2VkQ29uc3RyYWludHMs
IGZhbHNlKTsKKwlTdG9yZUNvbnN0cmFpbnRzKG5ld1JlbCwgY29va2VkQ29uc3RyYWludHMsIHRy
dWUpOwogCiAJLyogRG9uJ3QgbmVlZCB0aGUgY29va2VkQ29uc3RyYWludHMgYW55IG1vcmUuICov
CiAJbGlzdF9mcmVlX2RlZXAoY29va2VkQ29uc3RyYWludHMpOwotLSAKMi4zNC4xCgo=
--00000000000060cc9c0636e1f9b6--