Make WAL description output more consistent

petere · petere · commit 2d9140ed266d · 2018-11-20T13:30:01.000+01:00
The output for record types XLOG_DBASE_CREATE and XLOG_DBASE_DROP used the order dbid/tablespaceid, whereas elsewhere the order is tablespaceid/dbid[/relfilenodeid]. Flip the order for those two types to make it consistent. Author: Jean-Christophe Arnu <jcarnu@gmail.com> Discussion: https://www.postgresql.org/message-id/flat/CAHZmTm18Ln62KW-G8NYvO1wbBL3QU1E76Zep=DuHmg-zS2XFAg@mail.gmail.com/
diff --git a/src/backend/access/rmgrdesc/dbasedesc.c b/src/backend/access/rmgrdesc/dbasedesc.c
@@ -29,15 +29,15 @@ dbase_desc(StringInfo buf, XLogReaderState *record)
 		xl_dbase_create_rec *xlrec = (xl_dbase_create_rec *) rec;
 
 		appendStringInfo(buf, "copy dir %u/%u to %u/%u",
-						 xlrec->src_db_id, xlrec->src_tablespace_id,
-						 xlrec->db_id, xlrec->tablespace_id);
+						 xlrec->src_tablespace_id, xlrec->src_db_id,
+						 xlrec->tablespace_id, xlrec->db_id);
 	}
 	else if (info == XLOG_DBASE_DROP)
 	{
 		xl_dbase_drop_rec *xlrec = (xl_dbase_drop_rec *) rec;
 
 		appendStringInfo(buf, "dir %u/%u",
-						 xlrec->db_id, xlrec->tablespace_id);
+						 xlrec->tablespace_id, xlrec->db_id);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -29,15 +29,15 @@ dbase_desc(StringInfo buf, XLogReaderState *record)`
`29`	`29`	`xl_dbase_create_rec xlrec = (xl_dbase_create_rec ) rec;`
`30`	`30`
`31`	`31`	`appendStringInfo(buf, "copy dir %u/%u to %u/%u",`
`32`		`- xlrec->src_db_id, xlrec->src_tablespace_id,`
`33`		`- xlrec->db_id, xlrec->tablespace_id);`
	`32`	`+ xlrec->src_tablespace_id, xlrec->src_db_id,`
	`33`	`+ xlrec->tablespace_id, xlrec->db_id);`
`34`	`34`	`}`
`35`	`35`	`else if (info == XLOG_DBASE_DROP)`
`36`	`36`	`{`
`37`	`37`	`xl_dbase_drop_rec xlrec = (xl_dbase_drop_rec ) rec;`
`38`	`38`
`39`	`39`	`appendStringInfo(buf, "dir %u/%u",`
`40`		`- xlrec->db_id, xlrec->tablespace_id);`
	`40`	`+ xlrec->tablespace_id, xlrec->db_id);`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`