Rearrange some static assertions for consistency

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
index 1dab2787b7964555ad898b5bbf796aa65014dfea..be48886511e4bd63987de578caae7c795efc94c4 100644 (file)
--- 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
index eec644ec8489ed0b7ecd11db52e20d259782f89e..8b3596835396642f7e840709faf940a20a5415ac 100644 (file)
--- 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);