Rearrange some static assertions for consistency

petere · petere · commit b18c2decd76e · 2022-12-14T16:08:13.000+01:00
Put lengthof first. Reported-by: Peter Smith <smithpb2250@gmail.com> Discussion: https://www.postgresql.org/message-id/CAHut+PsUDMySVRuRc=h+P5N3+=TGvj4W_mi32XXg9dt4o-BXbA@mail.gmail.com
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c
@@ -496,7 +496,7 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 		&&CASE_EEOP_LAST
 	};
 
-	StaticAssertStmt(EEOP_LAST + 1 == lengthof(dispatch_table),
+	StaticAssertStmt(lengthof(dispatch_table) == EEOP_LAST + 1,
 					 "dispatch_table out of whack with ExprEvalOp");
 
 	if (unlikely(state == NULL))
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
@@ -1068,7 +1068,7 @@ InitCatalogCache(void)
 {
 	int			cacheId;
 
-	StaticAssertStmt(SysCacheSize == (int) lengthof(cacheinfo),
+	StaticAssertStmt(lengthof(cacheinfo) == SysCacheSize,
 					 "SysCacheSize does not match syscache.c's array");
 
 	Assert(!CacheInitialized);

Original file line number	Diff line number	Diff line change
`@@ -1068,7 +1068,7 @@ InitCatalogCache(void)`
`1068`	`1068`	`{`
`1069`	`1069`	`int cacheId;`
`1070`	`1070`
`1071`		`- StaticAssertStmt(SysCacheSize == (int) lengthof(cacheinfo),`
	`1071`	`+ StaticAssertStmt(lengthof(cacheinfo) == SysCacheSize,`
`1072`	`1072`	`"SysCacheSize does not match syscache.c's array");`
`1073`	`1073`
`1074`	`1074`	`Assert(!CacheInitialized);`