Fix ci failure and add more asserts.

contrib/pg_upgrade/pg_upgrade.c

@@ -674,7 +674,7 @@ set_frozenxids(void)
 		 * The logic here should keep consistent with function
 		 * should_have_valid_relfrozenxid().
 		 */
-								  "WHERE	(relkind = 'r' AND relfrozenxid != 0) "
+								  "WHERE	(relkind = 'r' AND not relfrozenxid = 0) "
 								  "OR (relkind IN ('t', 'o', 'b', 'm'))",
 								  old_cluster.controldata.chkpnt_nxtxid));
 		PQfinish(conn);

src/backend/commands/cluster.c

@@ -1398,6 +1398,7 @@ swap_relation_files(Oid r1, Oid r2, bool target_is_pg_class,
 	 */
 	if (TransactionIdIsValid(relform1->relfrozenxid))
 	{
+		Assert(TransactionIdIsNormal(frozenXid));
 		relform1->relfrozenxid = frozenXid;
 		/*
 		 * Don't know partition parent or not here but passing false is perfect

src/backend/utils/cache/relcache.c

@@ -2854,6 +2854,7 @@ RelationSetNewRelfilenode(Relation relation, TransactionId freezeXid)
 
 	if (TransactionIdIsValid(classform->relfrozenxid))
 	{
+		Assert(TransactionIdIsNormal(freezeXid));
 		classform->relfrozenxid = freezeXid;
 		/*
 		 * Don't know partition parent or not here but passing false is perfect