Remove, from stable branches, the new assertion of no pg_dump OID sort.

nmisch · nmisch · commit 216683296101 · 2025-08-10T13:05:16.000-07:00
Commit 0decd5e recently added the assertion to confirm dump order remains independent of OID values. The assertion remained reachable via DO_DEFAULT_ACL. Given the release wrap tomorrow, make the assertion master-only. Reported-by: Alexander Lakhin <exclusion@gmail.com> Reviewed-by: Robert Haas <robertmhaas@gmail.com> Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://postgr.es/m/d32aaa8d-df7c-4f94-bcb3-4c85f02bea21@gmail.com Backpatch-through: 13-18
diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
@@ -447,7 +447,6 @@ DOTypeNameCompare(const void *p1, const void *p2)
 	 * consequence of the test using "pg_restore -j", which doesn't fully
 	 * constrain OID assignment order.
 	 */
-	Assert(false);
 	return oidcmp(obj1->catId.oid, obj2->catId.oid);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,6 @@ DOTypeNameCompare(const void p1, const void p2)`
`447`	`447`	`* consequence of the test using "pg_restore -j", which doesn't fully`
`448`	`448`	`* constrain OID assignment order.`
`449`	`449`	`*/`
`450`		`- Assert(false);`
`451`	`450`	`return oidcmp(obj1->catId.oid, obj2->catId.oid);`
`452`	`451`	`}`
`453`	`452`