From bf25d57d5b1ab6d295221047af15246cd8dfcf5a Mon Sep 17 00:00:00 2001 From: Antonin Houska Date: Fri, 5 Jun 2020 16:42:34 +0200 Subject: [PATCH 3/5] Return early from ri_NullCheck() if possible. --- src/backend/utils/adt/ri_triggers.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index f08a83067b..647b102be1 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -2508,6 +2508,13 @@ ri_NullCheck(TupleDesc tupDesc, nonenull = false; else allnull = false; + + /* + * If seen both NULL and non-NULL, the next attributes cannot change + * the result. + */ + if (!nonenull && !allnull) + return RI_KEYS_SOME_NULL; } if (allnull) @@ -2516,7 +2523,8 @@ ri_NullCheck(TupleDesc tupDesc, if (nonenull) return RI_KEYS_NONE_NULL; - return RI_KEYS_SOME_NULL; + /* Should not happen. */ + Assert(false); } -- 2.20.1