Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vkeTL-000eop-1E for pgsql-hackers@arkaria.postgresql.org; Tue, 27 Jan 2026 08:30:52 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.96) (envelope-from ) id 1vkeTJ-00CsB1-1B for pgsql-hackers@arkaria.postgresql.org; Tue, 27 Jan 2026 08:30:49 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vkeTI-00CsAt-2b for pgsql-hackers@lists.postgresql.org; Tue, 27 Jan 2026 08:30:49 +0000 Received: from mail-dl1-x1229.google.com ([2607:f8b0:4864:20::1229]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.96) (envelope-from ) id 1vkeTF-002XFg-2k for pgsql-hackers@lists.postgresql.org; Tue, 27 Jan 2026 08:30:48 +0000 Received: by mail-dl1-x1229.google.com with SMTP id a92af1059eb24-1233702afd3so7157338c88.0 for ; Tue, 27 Jan 2026 00:30:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769502646; x=1770107446; darn=lists.postgresql.org; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=57gwySqYrwnx8p8FKDv/pW6T5+B7AG3zXajxRVDneaQ=; b=XJsAXHGiwWZyp7EhIYmpnaLHlYcvwiUUSaNI7mZBVKmkZ5GW5/PsYTwSYzA0vJ+Qtr mypkQJFHI6LkK6wlIGJKQfHMLRGqnmA68oJcqSdpbsP80NrOEcK8YrGA8NakQft9Ec0d kabd1+XW+2++YHXUvAe8sAECs0TJ/CLLr7a2SN7ZAwzrkQuaUKccmxU8vtXz9IX+via4 ZcM2PjELO/wCXer7x1AwOblhlOxsEZwd12rp4Myd/buui+DYEJfj72u4Ug2RUIrvs9ux nKSnbUVZtPXbrAd9fB9YEG47Z+enC1XApZBYNyOG8Ms8dxUhvbsbNHm2LuzXU9yeiKKQ WbAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769502646; x=1770107446; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=57gwySqYrwnx8p8FKDv/pW6T5+B7AG3zXajxRVDneaQ=; b=sERHWp+21itxkp0k2TBH+6c3BpCLVKm05lierGtdIkm3HGC29XQEDgbDXs6lctWsT0 LQTYIFYabFVlJE4nIZfNXk109PztPNwkIw2F1TxfHBgqPuoIHty/+uxb1p+XUczQ04u3 6eO11WCUbQkiWLH6umIRZTEcKeaWpIshhcxrIO0O5HfAbp4XWhWq7p7a9FpjlMzzY0XZ dtsxaFJD3rj7A9zhj5GOml8QZqjvchnbjfM8XcVTKTGd0Yxm4TP/u91SfH7bmFTKZ2xs MgGZwusP/o5V39ZD1PKaCbuZpx6wD1UALtPxd+7GY9s6sU3yJobw7G05lLQVQo2I1vZ3 sQVw== X-Gm-Message-State: AOJu0YzgsalpUGahL/oBTNLJfFUYp8h6HKQusW0bI7WazBFWtTyHYpeK NvV5a0v2fCGosukt6eBJtT2zW0JgoSsgNnOFSQg5oPu9FRYNARn7s/1g X-Gm-Gg: AZuq6aK7UHKVX5MYExGED+xePNZvtabcA7pUh6kop4b8YlvxypXa0M0up5Z9JK6Af/6 eVpx7CbKQ3Z+HEr8/l0bz28HkooQ2/Ieh+ToOQkyb0ZHG8h/hWGQYm68eccy+JhBa7pMiZparEO 4lPUKdSM1x1G9P8Jc8Hx8EXWTnmsnP0B/d6ehrxWF7fhBuUiyDuLPaYFVcYqDnIs7HYtugw7P7M 0pZ7iYVZK//WHXhv7p3wl6LdARzuDF5PFbibCisUifn485JtXN0HGoyHNscuJgWdUQFbeQX6yif AOiMVl3KTrN1xguJOXDgWh+fh/Z4fvk7/uQhO1Bt2uerLQRcvwA30BxYfkE9IDO0x5FKriqDpMu M5O06w0jwRSTHIxUkrTBRPSUFvmZ2S+m32mVzYrSvHD6hVsAhsdnuutTTrsNsJxDgGXsHSCfOBP Ki1HqrZDv/ksP4VdVOshNr X-Received: by 2002:a05:7022:eacf:b0:11b:9386:a38d with SMTP id a92af1059eb24-124a012eb45mr590252c88.48.1769502645542; Tue, 27 Jan 2026 00:30:45 -0800 (PST) Received: from smtpclient.apple ([142.171.105.12]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1247d998102sm23132037c88.10.2026.01.27.00.30.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Jan 2026 00:30:44 -0800 (PST) From: Chao Li Message-Id: Content-Type: multipart/mixed; boundary="Apple-Mail=_1210C205-5A7B-4BD4-A4C6-44489B792733" Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.300.41.1.7\)) Subject: Re: tablecmds: fix bug where index rebuild loses replica identity on partitions Date: Tue, 27 Jan 2026 16:30:10 +0800 In-Reply-To: <0B38B9DC-A53C-437C-B9BD-807F30A032BA@gmail.com> Cc: Postgres hackers To: Michael Paquier References: <0B38B9DC-A53C-437C-B9BD-807F30A032BA@gmail.com> X-Mailer: Apple Mail (2.3864.300.41.1.7) List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --Apple-Mail=_1210C205-5A7B-4BD4-A4C6-44489B792733 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Jan 27, 2026, at 15:59, Chao Li wrote: >=20 >=20 >=20 >> On Jan 27, 2026, at 15:39, Michael Paquier = wrote: >>=20 >> On Tue, Jan 27, 2026 at 01:13:32PM +0800, Chao Li wrote: >>> I found this bug while working on a related patch [1]. >>>=20 >>> When ALTER TABLE ... ALTER COLUMN TYPE causes an index rebuild, and >>> that index is used as REPLICA IDENTITY on a partitioned table, the >>> replica identity marking on partitions can be silently lost after = the >>> rebuild. >>=20 >> I am slightly confused by the tests included in the proposed patch. >> On HEAD, if I undo the proposed changes of tablecmds.c, the tests >> pass. If I run the tests of the patch with the changes of >> tablecmds.c, the tests also pass. =20 >=20 > Oops, that isn=E2=80=99t supposed to be so. I=E2=80=99ll check the = test. >=20 Okay, I see the problem is here: ``` +CREATE UNIQUE INDEX test_replica_identity_partitioned_pkey ON = test_replica_identity_partitioned (id); ``` I missed to add column =E2=80=9Cval=E2=80=9D into the index, so that = alter type of val didn=E2=80=99t cause index rebuild. Ideally, it=E2=80=99s better to also verify that index OIDs should have = changed before and after alter column type, but I haven=E2=80=99t = figured out how to do so. Do you have an idea? Please see v2, the test should fail on master now. Best regards, -- Chao Li (Evan) HighGo Software Co., Ltd. https://www.highgo.com/ --Apple-Mail=_1210C205-5A7B-4BD4-A4C6-44489B792733 Content-Disposition: attachment; filename=v2-0001-tablecmds-fix-bug-where-index-rebuild-loses-repli.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="v2-0001-tablecmds-fix-bug-where-index-rebuild-loses-repli.patch" Content-Transfer-Encoding: quoted-printable =46rom=20decbb28bc471cee9fcc7702f972d213b3218e1cc=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20"Chao=20Li=20(Evan)"=20=0A= Date:=20Tue,=2027=20Jan=202026=2012:41:05=20+0800=0ASubject:=20[PATCH=20= v2]=20tablecmds:=20fix=20bug=20where=20index=20rebuild=20loses=20replica=0A= =20identity=20on=20partitions=0A=0AALTER=20TABLE=20...=20ALTER=20COLUMN=20= TYPE=20may=20require=20rebuilding=20dependent=0Aindexes.=20=20When=20the=20= rebuilt=20index=20is=20marked=20as=20REPLICA=20IDENTITY=20on=20a=0A= partitioned=20table,=20tablecmds=20previously=20failed=20to=20restore=20= replica=0Aidentity=20on=20the=20affected=20partitions,=20leaving=20= logical=20replication=0Amisconfigured.=0A=0AFix=20this=20by=20tracking=20= replica=20identity=20indexes=20using=20OIDs=20and=20by=0Arecursively=20= collecting=20replica=20identity=20indexes=20on=20all=20partitions=20of=20= a=0Apartitioned=20table.=20=20After=20index=20rebuilds=20complete,=20= restore=20replica=0Aidentity=20markings=20for=20each=20affected=20table.=0A= =0AAdd=20regression=20tests=20covering=20multi-level=20partition=20= hierarchies,=0Aincluding=20partitions=20in=20different=20schemas,=20to=20= verify=20that=20replica=0Aidentity=20is=20preserved=20across=20index=20= rebuilds.=0A=0AAuthor:=20Chao=20Li=20=0AReviewed-by:=0A= Discussion:=20= https://postgr.es/m/DB533C25-C6BA-4C0F-8046-96168E9CDD72@gmail.com=0A---=0A= =20src/backend/commands/tablecmds.c=20=20=20=20=20=20=20=20=20=20=20=20=20= =20|=20118=20+++++++++++++-----=0A=20= .../regress/expected/replica_identity.out=20=20=20=20=20|=20=2067=20= ++++++++++=0A=20src/test/regress/sql/replica_identity.sql=20=20=20=20=20= |=20=2040=20++++++=0A=203=20files=20changed,=20196=20insertions(+),=2029=20= deletions(-)=0A=0Adiff=20--git=20a/src/backend/commands/tablecmds.c=20= b/src/backend/commands/tablecmds.c=0Aindex=20f976c0e5c7e..521d4fd2c2d=20= 100644=0A---=20a/src/backend/commands/tablecmds.c=0A+++=20= b/src/backend/commands/tablecmds.c=0A@@=20-204,7=20+204,10=20@@=20= typedef=20struct=20AlteredTableInfo=0A=20=09List=09=20=20=20= *changedConstraintDefs;=09/*=20string=20definitions=20of=20same=20*/=0A=20= =09List=09=20=20=20*changedIndexOids;=09/*=20OIDs=20of=20indexes=20to=20= rebuild=20*/=0A=20=09List=09=20=20=20*changedIndexDefs;=09/*=20string=20= definitions=20of=20same=20*/=0A-=09char=09=20=20=20= *replicaIdentityIndex;=09/*=20index=20to=20reset=20as=20REPLICA=20= IDENTITY=20*/=0A+=09List=09=20=20=20*replicaIdentityIndexOids;=09/*=20= OIDs=20of=20index=20to=20reset=20as=0A+=09=09=09=09=09=09=09=09=09=09=09=20= *=20REPLICA=20IDENTITY=20*/=0A+=09List=09=20=20=20= *replicaIdentityTableOids;=09/*=20OIDs=20of=20tables=20to=20reset=20as=0A= +=09=09=09=09=09=09=09=09=09=09=09=20*=20REPLICA=20IDENTITY=20*/=0A=20=09= char=09=20=20=20*clusterOnIndex;=20/*=20index=20to=20use=20for=20CLUSTER=20= */=0A=20=09List=09=20=20=20*changedStatisticsOids;=09/*=20OIDs=20of=20= statistics=20to=20rebuild=20*/=0A=20=09List=09=20=20=20= *changedStatisticsDefs;=09/*=20string=20definitions=20of=20same=20*/=0A= @@=20-647,9=20+650,9=20@@=20static=20bool=20= ATColumnChangeRequiresRewrite(Node=20*expr,=20AttrNumber=20varattno);=0A=20= static=20ObjectAddress=20ATExecAlterColumnType(AlteredTableInfo=20*tab,=20= Relation=20rel,=0A=20=09=09=09=09=09=09=09=09=09=09=20=20=20= AlterTableCmd=20*cmd,=20LOCKMODE=20lockmode);=0A=20static=20void=20= RememberAllDependentForRebuilding(AlteredTableInfo=20*tab,=20= AlterTableType=20subtype,=0A-=09=09=09=09=09=09=09=09=09=09=09=20=20= Relation=20rel,=20AttrNumber=20attnum,=20const=20char=20*colName);=0A= -static=20void=20RememberConstraintForRebuilding(Oid=20conoid,=20= AlteredTableInfo=20*tab);=0A-static=20void=20= RememberIndexForRebuilding(Oid=20indoid,=20AlteredTableInfo=20*tab);=0A+=09= =09=09=09=09=09=09=09=09=09=09=20=20Relation=20rel,=20AttrNumber=20= attnum,=20const=20char=20*colName,=20LOCKMODE=20lockmode);=0A+static=20= void=20RememberConstraintForRebuilding(Oid=20conoid,=20AlteredTableInfo=20= *tab,=20LOCKMODE=20lockmode);=0A+static=20void=20= RememberIndexForRebuilding(Oid=20indoid,=20AlteredTableInfo=20*tab,=20= LOCKMODE=20lockmode);=0A=20static=20void=20= RememberStatisticsForRebuilding(Oid=20stxoid,=20AlteredTableInfo=20= *tab);=0A=20static=20void=20ATPostAlterTypeCleanup(List=20**wqueue,=20= AlteredTableInfo=20*tab,=0A=20=09=09=09=09=09=09=09=09=20=20=20LOCKMODE=20= lockmode);=0A@@=20-8715,7=20+8718,7=20@@=20= ATExecSetExpression(AlteredTableInfo=20*tab,=20Relation=20rel,=20const=20= char=20*colName,=0A=20=09=09=20*=20etc),=20and=20record=20enough=20= information=20to=20let=20us=20recreate=20the=20objects=0A=20=09=09=20*=20= after=20rewrite.=0A=20=09=09=20*/=0A-=09=09= RememberAllDependentForRebuilding(tab,=20AT_SetExpression,=20rel,=20= attnum,=20colName);=0A+=09=09RememberAllDependentForRebuilding(tab,=20= AT_SetExpression,=20rel,=20attnum,=20colName,=20lockmode);=0A=20=09}=0A=20= =0A=20=09/*=0A@@=20-14868,7=20+14871,7=20@@=20= ATExecAlterColumnType(AlteredTableInfo=20*tab,=20Relation=20rel,=0A=20=09= =20*=20the=20info=20before=20executing=20ALTER=20TYPE,=20though,=20else=20= the=20deparser=20will=0A=20=09=20*=20get=20confused.=0A=20=09=20*/=0A-=09= RememberAllDependentForRebuilding(tab,=20AT_AlterColumnType,=20rel,=20= attnum,=20colName);=0A+=09RememberAllDependentForRebuilding(tab,=20= AT_AlterColumnType,=20rel,=20attnum,=20colName,=20lockmode);=0A=20=0A=20=09= /*=0A=20=09=20*=20Now=20scan=20for=20dependencies=20of=20this=20column=20= on=20other=20things.=20=20The=20only=0A@@=20-15071,7=20+15074,7=20@@=20= ATExecAlterColumnType(AlteredTableInfo=20*tab,=20Relation=20rel,=0A=20=20= */=0A=20static=20void=0A=20= RememberAllDependentForRebuilding(AlteredTableInfo=20*tab,=20= AlterTableType=20subtype,=0A-=09=09=09=09=09=09=09=09=20=20Relation=20= rel,=20AttrNumber=20attnum,=20const=20char=20*colName)=0A+=09=09=09=09=09= =09=09=09=20=20Relation=20rel,=20AttrNumber=20attnum,=20const=20char=20= *colName,=20LOCKMODE=20lockmode)=0A=20{=0A=20=09Relation=09depRel;=0A=20=09= ScanKeyData=20key[3];=0A@@=20-15117,7=20+15120,7=20@@=20= RememberAllDependentForRebuilding(AlteredTableInfo=20*tab,=20= AlterTableType=20subtype,=0A=20=09=09=09=09=09=09relKind=20=3D=3D=20= RELKIND_PARTITIONED_INDEX)=0A=20=09=09=09=09=09{=0A=20=09=09=09=09=09=09= Assert(foundObject.objectSubId=20=3D=3D=200);=0A-=09=09=09=09=09=09= RememberIndexForRebuilding(foundObject.objectId,=20tab);=0A+=09=09=09=09=09= =09RememberIndexForRebuilding(foundObject.objectId,=20tab,=20lockmode);=0A= =20=09=09=09=09=09}=0A=20=09=09=09=09=09else=20if=20(relKind=20=3D=3D=20= RELKIND_SEQUENCE)=0A=20=09=09=09=09=09{=0A@@=20-15138,7=20+15141,7=20@@=20= RememberAllDependentForRebuilding(AlteredTableInfo=20*tab,=20= AlterTableType=20subtype,=0A=20=0A=20=09=09=09case=20= ConstraintRelationId:=0A=20=09=09=09=09Assert(foundObject.objectSubId=20= =3D=3D=200);=0A-=09=09=09=09= RememberConstraintForRebuilding(foundObject.objectId,=20tab);=0A+=09=09=09= =09RememberConstraintForRebuilding(foundObject.objectId,=20tab,=20= lockmode);=0A=20=09=09=09=09break;=0A=20=0A=20=09=09=09case=20= ProcedureRelationId:=0A@@=20-15291,20=20+15294,65=20@@=20= RememberAllDependentForRebuilding(AlteredTableInfo=20*tab,=20= AlterTableType=20subtype,=0A=20=09table_close(depRel,=20NoLock);=0A=20}=0A= =20=0A+static=20void=0A= +find_partition_replica_identity_indexes(AlteredTableInfo=20*tab,=20Oid=20= relId,=20Oid=20indexId,=20LOCKMODE=20lockmode)=0A+{=0A+=09List=09=20=20=20= *partRelIds=20=3D=20NIL;=0A+=0A+=09partRelIds=20=3D=20= find_inheritance_children(relId,=20lockmode);=0A+=09= foreach_oid(partRelOid,=20partRelIds)=0A+=09{=0A+=09=09Relation=09= partRel;=0A+=09=09Oid=09=09=09partIndexId;=0A+=0A+=09=09/*=20= find_inheritance_children=20already=20got=20lock=20*/=0A+=09=09partRel=20= =3D=20relation_open(partRelOid,=20lockmode);=0A+=0A+=09=09partIndexId=20= =3D=20index_get_partition(partRel,=20indexId);=0A+=09=09if=20= (!OidIsValid(partIndexId))=0A+=09=09{=0A+=09=09=09= relation_close(partRel,=20NoLock);=0A+=09=09=09continue;=0A+=09=09}=0A+=0A= +=09=09if=20(get_index_isreplident(partIndexId))=0A+=09=09{=0A+=09=09=09= tab->replicaIdentityIndexOids=20=3D=20= lappend_oid(tab->replicaIdentityIndexOids,=20partIndexId);=0A+=09=09=09= tab->replicaIdentityTableOids=20=3D=20= lappend_oid(tab->replicaIdentityTableOids,=20partRelOid);=0A+=09=09}=0A+=0A= +=09=09if=20(partRel->rd_rel->relkind=20=3D=3D=20= RELKIND_PARTITIONED_TABLE)=0A+=09=09{=0A+=09=09=09= find_partition_replica_identity_indexes(tab,=20partRelOid,=20= partIndexId,=20lockmode);=0A+=09=09}=0A+=0A+=09=09= relation_close(partRel,=20NoLock);=0A+=09}=0A+=09list_free(partRelIds);=0A= +}=0A+=0A=20/*=0A=20=20*=20Subroutine=20for=20ATExecAlterColumnType:=20= remember=20that=20a=20replica=20identity=0A=20=20*=20needs=20to=20be=20= reset.=0A=20=20*/=0A=20static=20void=0A= -RememberReplicaIdentityForRebuilding(Oid=20indoid,=20AlteredTableInfo=20= *tab)=0A+RememberReplicaIdentityForRebuilding(Oid=20indoid,=20= AlteredTableInfo=20*tab,=20LOCKMODE=20lockmode)=0A=20{=0A=20=09if=20= (!get_index_isreplident(indoid))=0A=20=09=09return;=0A=20=0A-=09if=20= (tab->replicaIdentityIndex)=0A+=09if=20(tab->replicaIdentityIndexOids=20= !=3D=20NIL)=0A=20=09=09elog(ERROR,=20"relation=20%u=20has=20multiple=20= indexes=20marked=20as=20replica=20identity",=20tab->relid);=0A=20=0A-=09= tab->replicaIdentityIndex=20=3D=20get_rel_name(indoid);=0A+=09= tab->replicaIdentityIndexOids=20=3D=20= lappend_oid(tab->replicaIdentityIndexOids,=20indoid);=0A+=09= tab->replicaIdentityTableOids=20=3D=20= lappend_oid(tab->replicaIdentityTableOids,=20tab->relid);=0A+=0A+=09/*=20= For=20regular=20tables,=20we=20can=20only=20have=20one=20replica=20= identity=20index=20*/=0A+=09if=20(tab->rel->rd_rel->relkind=20!=3D=20= RELKIND_PARTITIONED_TABLE)=0A+=09=09return;=0A+=0A+=09/*=20For=20= partitioned=20tables,=20find=20all=20partitions'=20replica=20identity=20= indexes=20*/=0A+=09find_partition_replica_identity_indexes(tab,=20= tab->relid,=20indoid,=20lockmode);=0A=20}=0A=20=0A=20/*=0A@@=20-15327,7=20= +15375,7=20@@=20RememberClusterOnForRebuilding(Oid=20indoid,=20= AlteredTableInfo=20*tab)=0A=20=20*=20to=20be=20rebuilt=20(which=20we=20= might=20already=20know).=0A=20=20*/=0A=20static=20void=0A= -RememberConstraintForRebuilding(Oid=20conoid,=20AlteredTableInfo=20= *tab)=0A+RememberConstraintForRebuilding(Oid=20conoid,=20= AlteredTableInfo=20*tab,=20LOCKMODE=20lockmode)=0A=20{=0A=20=09/*=0A=20=09= =20*=20This=20de-duplication=20check=20is=20critical=20for=20two=20= independent=20reasons:=20we=0A@@=20-15372,7=20+15420,7=20@@=20= RememberConstraintForRebuilding(Oid=20conoid,=20AlteredTableInfo=20*tab)=0A= =20=09=09indoid=20=3D=20get_constraint_index(conoid);=0A=20=09=09if=20= (OidIsValid(indoid))=0A=20=09=09{=0A-=09=09=09= RememberReplicaIdentityForRebuilding(indoid,=20tab);=0A+=09=09=09= RememberReplicaIdentityForRebuilding(indoid,=20tab,=20lockmode);=0A=20=09= =09=09RememberClusterOnForRebuilding(indoid,=20tab);=0A=20=09=09}=0A=20=09= }=0A@@=20-15383,7=20+15431,7=20@@=20RememberConstraintForRebuilding(Oid=20= conoid,=20AlteredTableInfo=20*tab)=0A=20=20*=20to=20be=20rebuilt=20= (which=20we=20might=20already=20know).=0A=20=20*/=0A=20static=20void=0A= -RememberIndexForRebuilding(Oid=20indoid,=20AlteredTableInfo=20*tab)=0A= +RememberIndexForRebuilding(Oid=20indoid,=20AlteredTableInfo=20*tab,=20= LOCKMODE=20lockmode)=0A=20{=0A=20=09/*=0A=20=09=20*=20This=20= de-duplication=20check=20is=20critical=20for=20two=20independent=20= reasons:=20we=0A@@=20-15406,7=20+15454,7=20@@=20= RememberIndexForRebuilding(Oid=20indoid,=20AlteredTableInfo=20*tab)=0A=20= =0A=20=09=09if=20(OidIsValid(conoid))=0A=20=09=09{=0A-=09=09=09= RememberConstraintForRebuilding(conoid,=20tab);=0A+=09=09=09= RememberConstraintForRebuilding(conoid,=20tab,=20lockmode);=0A=20=09=09}=0A= =20=09=09else=0A=20=09=09{=0A@@=20-15423,7=20+15471,7=20@@=20= RememberIndexForRebuilding(Oid=20indoid,=20AlteredTableInfo=20*tab)=0A=20= =09=09=09=20*=20or=20if=20it=20is=20a=20clustered=20index,=20so=20that=20= ATPostAlterTypeCleanup()=0A=20=09=09=09=20*=20can=20queue=20up=20= commands=20necessary=20to=20restore=20those=20properties.=0A=20=09=09=09=20= */=0A-=09=09=09RememberReplicaIdentityForRebuilding(indoid,=20tab);=0A+=09= =09=09RememberReplicaIdentityForRebuilding(indoid,=20tab,=20lockmode);=0A= =20=09=09=09RememberClusterOnForRebuilding(indoid,=20tab);=0A=20=09=09}=0A= =20=09}=0A@@=20-15602,19=20+15650,31=20@@=20ATPostAlterTypeCleanup(List=20= **wqueue,=20AlteredTableInfo=20*tab,=20LOCKMODE=20lockmode)=0A=20=09/*=0A= =20=09=20*=20Queue=20up=20command=20to=20restore=20replica=20identity=20= index=20marking=0A=20=09=20*/=0A-=09if=20(tab->replicaIdentityIndex)=0A+=09= if=20(tab->replicaIdentityIndexOids=20!=3D=20NIL)=0A=20=09{=0A-=09=09= AlterTableCmd=20*cmd=20=3D=20makeNode(AlterTableCmd);=0A-=09=09= ReplicaIdentityStmt=20*subcmd=20=3D=20makeNode(ReplicaIdentityStmt);=0A-=0A= -=09=09subcmd->identity_type=20=3D=20REPLICA_IDENTITY_INDEX;=0A-=09=09= subcmd->name=20=3D=20tab->replicaIdentityIndex;=0A-=09=09cmd->subtype=20= =3D=20AT_ReplicaIdentity;=0A-=09=09cmd->def=20=3D=20(Node=20*)=20subcmd;=0A= -=0A-=09=09/*=20do=20it=20after=20indexes=20and=20constraints=20*/=0A-=09= =09tab->subcmds[AT_PASS_OLD_CONSTR]=20=3D=0A-=09=09=09= lappend(tab->subcmds[AT_PASS_OLD_CONSTR],=20cmd);=0A+=09=09= forboth(oid_item,=20tab->replicaIdentityIndexOids,=0A+=09=09=09=09= def_item,=20tab->replicaIdentityTableOids)=0A+=09=09{=0A+=09=09=09Oid=09=09= =09indexId=20=3D=20lfirst_oid(oid_item);=0A+=09=09=09Oid=09=09=09relId=20= =3D=20lfirst_oid(def_item);=0A+=09=09=09Relation=09partrel;=0A+=09=09=09= AlteredTableInfo=20*parttab;=0A+=0A+=09=09=09AlterTableCmd=20*cmd=20=3D=20= makeNode(AlterTableCmd);=0A+=09=09=09ReplicaIdentityStmt=20*subcmd=20=3D=20= makeNode(ReplicaIdentityStmt);=0A+=0A+=09=09=09subcmd->identity_type=20=3D= =20REPLICA_IDENTITY_INDEX;=0A+=09=09=09subcmd->name=20=3D=20= get_rel_name(indexId);=0A+=09=09=09cmd->subtype=20=3D=20= AT_ReplicaIdentity;=0A+=09=09=09cmd->def=20=3D=20(Node=20*)=20subcmd;=0A= +=0A+=09=09=09/*=20do=20it=20after=20indexes=20and=20constraints=20*/=0A= +=09=09=09partrel=20=3D=20relation_open(relId,=20lockmode);=0A+=09=09=09= parttab=20=3D=20ATGetQueueEntry(wqueue,=20partrel);=0A+=09=09=09= parttab->subcmds[AT_PASS_OLD_CONSTR]=20=3D=0A+=09=09=09=09= lappend(parttab->subcmds[AT_PASS_OLD_CONSTR],=20cmd);=0A+=09=09=09= relation_close(partrel,=20NoLock);=0A+=09=09}=0A=20=09}=0A=20=0A=20=09/*=0A= diff=20--git=20a/src/test/regress/expected/replica_identity.out=20= b/src/test/regress/expected/replica_identity.out=0Aindex=20= b9b8dde018f..0cdf7666fb9=20100644=0A---=20= a/src/test/regress/expected/replica_identity.out=0A+++=20= b/src/test/regress/expected/replica_identity.out=0A@@=20-290,6=20+290,73=20= @@=20ALTER=20TABLE=20test_replica_identity5=20DROP=20CONSTRAINT=20= test_replica_identity5_pkey;=0A=20ERROR:=20=20constraint=20= "test_replica_identity5_pkey"=20of=20relation=20"test_replica_identity5"=20= does=20not=20exist=0A=20ALTER=20TABLE=20test_replica_identity5=20ALTER=20= b=20DROP=20NOT=20NULL;=0A=20ERROR:=20=20column=20"b"=20is=20in=20index=20= used=20as=20replica=20identity=0A+--=0A+--=20Test=20index=20rebuild=20= preserves=20replica=20identity=20against=20partitioned=20tables=0A+--=0A= +CREATE=20TABLE=20test_replica_identity_partitioned=20(id=20int=20NOT=20= NULL,=20val=20int=20NOT=20NULL)=20PARTITION=20BY=20RANGE=20(id);=0A= +CREATE=20TABLE=20test_replica_identity_partitioned_p1=20PARTITION=20OF=20= test_replica_identity_partitioned=0A+=20=20=20=20FOR=20VALUES=20FROM=20= (0)=20TO=20(100);=0A+CREATE=20TABLE=20= test_replica_identity_partitioned_p2=20PARTITION=20OF=20= test_replica_identity_partitioned=0A+=20=20=20=20FOR=20VALUES=20FROM=20= (101)=20TO=20(200)=20PARTITION=20BY=20LIST=20(id);=0A+CREATE=20TABLE=20= test_replica_identity_partitioned_p2_1=20PARTITION=20OF=20= test_replica_identity_partitioned_p2=0A+=20=20=20=20FOR=20VALUES=20IN=20= (150,=20160);=0A+--=20For=20better=20coverage,=20create=20a=20parition=20= in=20a=20different=20schema=0A+CREATE=20SCHEMA=20= test_replica_identity_schema;=0A+CREATE=20TABLE=20= test_replica_identity_schema.test_replica_identity_partitioned_p2_2=20= PARTITION=20OF=20test_replica_identity_partitioned_p2=0A+=20=20=20=20FOR=20= VALUES=20IN=20(170,=20180);=0A+CREATE=20UNIQUE=20INDEX=20= test_replica_identity_partitioned_pkey=20ON=20= test_replica_identity_partitioned=20(id,=20val);=0A+SELECT=20tc.relname=20= as=20table_name,=20tc.relreplident,=20i.indexrelid::regclass=20AS=20= index_name,=20i.indisreplident=20FROM=20pg_class=20c=0A+=20=20LEFT=20= JOIN=20pg_index=20i=20ON=20c.oid=20=3D=20i.indexrelid=0A+=20=20LEFT=20= JOIN=20pg_class=20tc=20ON=20i.indrelid=20=3D=20tc.oid=0A+=20=20WHERE=20= c.relname=20LIKE=20'test_replica_identity_partitioned%'=20and=20= c.relkind=20in=20('i',=20'I')=0A+=20=20ORDER=20BY=20c.relname;=0A+=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20table_name=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20|=20relreplident=20|=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= index_name=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20indisreplident=20=0A= +----------------------------------------+--------------+-----------------= ---------------------------------------------------------------+----------= ------=0A+=20test_replica_identity_partitioned_p1=20=20=20|=20d=20=20=20=20= =20=20=20=20=20=20=20=20|=20= test_replica_identity_partitioned_p1_id_val_idx=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20= f=0A+=20test_replica_identity_partitioned_p2_1=20|=20d=20=20=20=20=20=20=20= =20=20=20=20=20|=20test_replica_identity_partitioned_p2_1_id_val_idx=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20|=20f=0A+=20test_replica_identity_partitioned_p2_2=20|=20d=20=20= =20=20=20=20=20=20=20=20=20=20|=20= test_replica_identity_schema.test_replica_identity_partitioned_p2_2_id_val= _idx=20|=20f=0A+=20test_replica_identity_partitioned_p2=20=20=20|=20d=20=20= =20=20=20=20=20=20=20=20=20=20|=20= test_replica_identity_partitioned_p2_id_val_idx=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20= f=0A+=20test_replica_identity_partitioned=20=20=20=20=20=20|=20d=20=20=20= =20=20=20=20=20=20=20=20=20|=20test_replica_identity_partitioned_pkey=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20f=0A+(5=20rows)=0A+=0A= +ALTER=20TABLE=20test_replica_identity_partitioned=20REPLICA=20IDENTITY=20= USING=20INDEX=20test_replica_identity_partitioned_pkey;=0A+ALTER=20TABLE=20= test_replica_identity_partitioned_p1=20REPLICA=20IDENTITY=20USING=20= INDEX=20test_replica_identity_partitioned_p1_id_val_idx;=0A+ALTER=20= TABLE=20test_replica_identity_partitioned_p2_1=20REPLICA=20IDENTITY=20= USING=20INDEX=20test_replica_identity_partitioned_p2_1_id_val_idx;=0A= +ALTER=20TABLE=20= test_replica_identity_schema.test_replica_identity_partitioned_p2_2=20= REPLICA=20IDENTITY=20USING=20INDEX=20= test_replica_identity_partitioned_p2_2_id_val_idx;=0A+SELECT=20= tc.relname=20as=20table_name,=20tc.relreplident,=20= i.indexrelid::regclass=20AS=20index_name,=20i.indisreplident=20FROM=20= pg_class=20c=0A+=20=20LEFT=20JOIN=20pg_index=20i=20ON=20c.oid=20=3D=20= i.indexrelid=0A+=20=20LEFT=20JOIN=20pg_class=20tc=20ON=20i.indrelid=20=3D=20= tc.oid=0A+=20=20WHERE=20c.relname=20LIKE=20= 'test_replica_identity_partitioned%'=20and=20c.relkind=20in=20('i',=20= 'I')=0A+=20=20ORDER=20BY=20c.relname;=0A+=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20table_name=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20= relreplident=20|=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20index_name=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20|=20indisreplident=20=0A= +----------------------------------------+--------------+-----------------= ---------------------------------------------------------------+----------= ------=0A+=20test_replica_identity_partitioned_p1=20=20=20|=20i=20=20=20=20= =20=20=20=20=20=20=20=20|=20= test_replica_identity_partitioned_p1_id_val_idx=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20= t=0A+=20test_replica_identity_partitioned_p2_1=20|=20i=20=20=20=20=20=20=20= =20=20=20=20=20|=20test_replica_identity_partitioned_p2_1_id_val_idx=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20|=20t=0A+=20test_replica_identity_partitioned_p2_2=20|=20i=20=20= =20=20=20=20=20=20=20=20=20=20|=20= test_replica_identity_schema.test_replica_identity_partitioned_p2_2_id_val= _idx=20|=20t=0A+=20test_replica_identity_partitioned_p2=20=20=20|=20d=20=20= =20=20=20=20=20=20=20=20=20=20|=20= test_replica_identity_partitioned_p2_id_val_idx=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20= f=0A+=20test_replica_identity_partitioned=20=20=20=20=20=20|=20i=20=20=20= =20=20=20=20=20=20=20=20=20|=20test_replica_identity_partitioned_pkey=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20t=0A+(5=20rows)=0A+=0A= +ALTER=20TABLE=20test_replica_identity_partitioned=20ALTER=20COLUMN=20= val=20TYPE=20bigint;=0A+SELECT=20tc.relname=20as=20table_name,=20= tc.relreplident,=20i.indexrelid::regclass=20AS=20index_name,=20= i.indisreplident=20FROM=20pg_class=20c=0A+=20=20LEFT=20JOIN=20pg_index=20= i=20ON=20c.oid=20=3D=20i.indexrelid=0A+=20=20LEFT=20JOIN=20pg_class=20tc=20= ON=20i.indrelid=20=3D=20tc.oid=0A+=20=20WHERE=20c.relname=20LIKE=20= 'test_replica_identity_partitioned%'=20and=20c.relkind=20in=20('i',=20= 'I')=0A+=20=20ORDER=20BY=20c.relname;=0A+=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20table_name=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20= relreplident=20|=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20index_name=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20|=20indisreplident=20=0A= +----------------------------------------+--------------+-----------------= ---------------------------------------------------------------+----------= ------=0A+=20test_replica_identity_partitioned_p1=20=20=20|=20i=20=20=20=20= =20=20=20=20=20=20=20=20|=20= test_replica_identity_partitioned_p1_id_val_idx=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20= t=0A+=20test_replica_identity_partitioned_p2_1=20|=20i=20=20=20=20=20=20=20= =20=20=20=20=20|=20test_replica_identity_partitioned_p2_1_id_val_idx=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20|=20t=0A+=20test_replica_identity_partitioned_p2_2=20|=20i=20=20= =20=20=20=20=20=20=20=20=20=20|=20= test_replica_identity_schema.test_replica_identity_partitioned_p2_2_id_val= _idx=20|=20t=0A+=20test_replica_identity_partitioned_p2=20=20=20|=20d=20=20= =20=20=20=20=20=20=20=20=20=20|=20= test_replica_identity_partitioned_p2_id_val_idx=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20= f=0A+=20test_replica_identity_partitioned=20=20=20=20=20=20|=20i=20=20=20= =20=20=20=20=20=20=20=20=20|=20test_replica_identity_partitioned_pkey=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20t=0A+(5=20rows)=0A+=0A= +DROP=20SCHEMA=20test_replica_identity_schema=20CASCADE;=0A+NOTICE:=20=20= drop=20cascades=20to=20table=20= test_replica_identity_schema.test_replica_identity_partitioned_p2_2=0A= +--=0A+--=20Cleanup=0A+--=0A=20DROP=20TABLE=20test_replica_identity;=0A=20= DROP=20TABLE=20test_replica_identity2;=0A=20DROP=20TABLE=20= test_replica_identity3;=0Adiff=20--git=20= a/src/test/regress/sql/replica_identity.sql=20= b/src/test/regress/sql/replica_identity.sql=0Aindex=20= 30daec05b71..20e62b2e4f2=20100644=0A---=20= a/src/test/regress/sql/replica_identity.sql=0A+++=20= b/src/test/regress/sql/replica_identity.sql=0A@@=20-134,6=20+134,46=20@@=20= ALTER=20TABLE=20test_replica_identity5=20ALTER=20b=20SET=20NOT=20NULL;=0A= =20ALTER=20TABLE=20test_replica_identity5=20DROP=20CONSTRAINT=20= test_replica_identity5_pkey;=0A=20ALTER=20TABLE=20test_replica_identity5=20= ALTER=20b=20DROP=20NOT=20NULL;=0A=20=0A+--=0A+--=20Test=20index=20= rebuild=20preserves=20replica=20identity=20against=20partitioned=20= tables=0A+--=0A+CREATE=20TABLE=20test_replica_identity_partitioned=20(id=20= int=20NOT=20NULL,=20val=20int=20NOT=20NULL)=20PARTITION=20BY=20RANGE=20= (id);=0A+CREATE=20TABLE=20test_replica_identity_partitioned_p1=20= PARTITION=20OF=20test_replica_identity_partitioned=0A+=20=20=20=20FOR=20= VALUES=20FROM=20(0)=20TO=20(100);=0A+CREATE=20TABLE=20= test_replica_identity_partitioned_p2=20PARTITION=20OF=20= test_replica_identity_partitioned=0A+=20=20=20=20FOR=20VALUES=20FROM=20= (101)=20TO=20(200)=20PARTITION=20BY=20LIST=20(id);=0A+CREATE=20TABLE=20= test_replica_identity_partitioned_p2_1=20PARTITION=20OF=20= test_replica_identity_partitioned_p2=0A+=20=20=20=20FOR=20VALUES=20IN=20= (150,=20160);=0A+--=20For=20better=20coverage,=20create=20a=20parition=20= in=20a=20different=20schema=0A+CREATE=20SCHEMA=20= test_replica_identity_schema;=0A+CREATE=20TABLE=20= test_replica_identity_schema.test_replica_identity_partitioned_p2_2=20= PARTITION=20OF=20test_replica_identity_partitioned_p2=0A+=20=20=20=20FOR=20= VALUES=20IN=20(170,=20180);=0A+CREATE=20UNIQUE=20INDEX=20= test_replica_identity_partitioned_pkey=20ON=20= test_replica_identity_partitioned=20(id,=20val);=0A+SELECT=20tc.relname=20= as=20table_name,=20tc.relreplident,=20i.indexrelid::regclass=20AS=20= index_name,=20i.indisreplident=20FROM=20pg_class=20c=0A+=20=20LEFT=20= JOIN=20pg_index=20i=20ON=20c.oid=20=3D=20i.indexrelid=0A+=20=20LEFT=20= JOIN=20pg_class=20tc=20ON=20i.indrelid=20=3D=20tc.oid=0A+=20=20WHERE=20= c.relname=20LIKE=20'test_replica_identity_partitioned%'=20and=20= c.relkind=20in=20('i',=20'I')=0A+=20=20ORDER=20BY=20c.relname;=0A+ALTER=20= TABLE=20test_replica_identity_partitioned=20REPLICA=20IDENTITY=20USING=20= INDEX=20test_replica_identity_partitioned_pkey;=0A+ALTER=20TABLE=20= test_replica_identity_partitioned_p1=20REPLICA=20IDENTITY=20USING=20= INDEX=20test_replica_identity_partitioned_p1_id_val_idx;=0A+ALTER=20= TABLE=20test_replica_identity_partitioned_p2_1=20REPLICA=20IDENTITY=20= USING=20INDEX=20test_replica_identity_partitioned_p2_1_id_val_idx;=0A= +ALTER=20TABLE=20= test_replica_identity_schema.test_replica_identity_partitioned_p2_2=20= REPLICA=20IDENTITY=20USING=20INDEX=20= test_replica_identity_partitioned_p2_2_id_val_idx;=0A+SELECT=20= tc.relname=20as=20table_name,=20tc.relreplident,=20= i.indexrelid::regclass=20AS=20index_name,=20i.indisreplident=20FROM=20= pg_class=20c=0A+=20=20LEFT=20JOIN=20pg_index=20i=20ON=20c.oid=20=3D=20= i.indexrelid=0A+=20=20LEFT=20JOIN=20pg_class=20tc=20ON=20i.indrelid=20=3D=20= tc.oid=0A+=20=20WHERE=20c.relname=20LIKE=20= 'test_replica_identity_partitioned%'=20and=20c.relkind=20in=20('i',=20= 'I')=0A+=20=20ORDER=20BY=20c.relname;=0A+ALTER=20TABLE=20= test_replica_identity_partitioned=20ALTER=20COLUMN=20val=20TYPE=20= bigint;=0A+SELECT=20tc.relname=20as=20table_name,=20tc.relreplident,=20= i.indexrelid::regclass=20AS=20index_name,=20i.indisreplident=20FROM=20= pg_class=20c=0A+=20=20LEFT=20JOIN=20pg_index=20i=20ON=20c.oid=20=3D=20= i.indexrelid=0A+=20=20LEFT=20JOIN=20pg_class=20tc=20ON=20i.indrelid=20=3D=20= tc.oid=0A+=20=20WHERE=20c.relname=20LIKE=20= 'test_replica_identity_partitioned%'=20and=20c.relkind=20in=20('i',=20= 'I')=0A+=20=20ORDER=20BY=20c.relname;=0A+DROP=20SCHEMA=20= test_replica_identity_schema=20CASCADE;=0A+=0A+--=0A+--=20Cleanup=0A+--=0A= =20DROP=20TABLE=20test_replica_identity;=0A=20DROP=20TABLE=20= test_replica_identity2;=0A=20DROP=20TABLE=20test_replica_identity3;=0A--=20= =0A2.50.1=20(Apple=20Git-155)=0A=0A= --Apple-Mail=_1210C205-5A7B-4BD4-A4C6-44489B792733--