postgres.git / summary / log / commit / refs

commit    9ef86cd994e9f2a684996df994d4657e84a6c0bb
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Thu Jun 27 17:54:50 2013 +0000
First released in: 9.4.0, 8.4.18, 9.0.14, 9.1.10, 9.2.5, 9.3.0

    Mark index-constraint comments with correct dependency in pg_dump.
    
    When there's a comment on an index that was created with UNIQUE or PRIMARY
    KEY constraint syntax, we need to label the comment as depending on the
    constraint not the index, since only the constraint object actually appears
    in the dump.  This incorrect dependency can lead to parallel pg_restore
    trying to restore the comment before the index has been created, per bug
    #8257 from Lloyd Albin.
    
    This patch fixes pg_dump to produce the right dependency in dumps made
    in the future.  Usually we also try to hack pg_restore to work around
    bogus dependencies, so that existing (wrong) dumps can still be restored in
    parallel mode; but that doesn't seem practical here since there's no easy
    way to relate the constraint dump entry to the comment after the fact.
    
    Andres Freund


 src/bin/pg_dump/pg_dump.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 2ce0cd8fb53..becc82be91e 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -13490,6 +13490,7 @@ static void
 dumpIndex(Archive *fout, IndxInfo *indxinfo)
 {
 	TableInfo  *tbinfo = indxinfo->indextable;
+	bool		is_constraint = (indxinfo->indexconstraint != 0);
 	PQExpBuffer q;
 	PQExpBuffer delq;
 	PQExpBuffer labelq;
@@ -13507,9 +13508,11 @@ dumpIndex(Archive *fout, IndxInfo *indxinfo)
 	/*
 	 * If there's an associated constraint, don't dump the index per se, but
 	 * do dump any comment for it.	(This is safe because dependency ordering
-	 * will have ensured the constraint is emitted first.)
+	 * will have ensured the constraint is emitted first.)  Note that the
+	 * emitted comment has to be shown as depending on the constraint, not
+	 * the index, in such cases.
 	 */
-	if (indxinfo->indexconstraint == 0)
+	if (!is_constraint)
 	{
 		if (binary_upgrade)
 			binary_upgrade_set_pg_class_oids(fout, q,
@@ -13551,7 +13554,9 @@ dumpIndex(Archive *fout, IndxInfo *indxinfo)
 	dumpComment(fout, labelq->data,
 				tbinfo->dobj.namespace->dobj.name,
 				tbinfo->rolname,
-				indxinfo->dobj.catId, 0, indxinfo->dobj.dumpId);
+				indxinfo->dobj.catId, 0,
+				is_constraint ? indxinfo->indexconstraint :
+				indxinfo->dobj.dumpId);
 
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);


[parent: a099482c86d8]