aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor/execExpr.c
diff options
context:
space:
mode:
authorAmit Langote <amitlan@postgresql.org>2024-09-09 13:46:58 +0900
committerAmit Langote <amitlan@postgresql.org>2024-09-09 13:46:58 +0900
commitdd8bea88abf4794d99270ced884a8bc1e387255d (patch)
treed1be3ffc41c4ebfec668ec92789a06270661500f /src/backend/executor/execExpr.c
parent87b6c3c0b703c3a71bc640f456a24937744ff30b (diff)
downloadpostgresql-dd8bea88abf4794d99270ced884a8bc1e387255d.tar.gz
postgresql-dd8bea88abf4794d99270ced884a8bc1e387255d.zip
SQL/JSON: Avoid initializing unnecessary ON ERROR / ON EMPTY steps
When the ON ERROR / ON EMPTY behavior is to return NULL, returning NULL directly from ExecEvalJsonExprPath() suffices. Therefore, there's no need to create separate steps to check the error/empty flag or those to evaluate the the constant NULL expression. This speeds up common cases because the default ON ERROR / ON EMPTY behavior for JSON_QUERY() and JSON_VALUE() is to return NULL. However, these steps are necessary if the RETURNING type is a domain, as constraints on the domain may need to be checked. Reported-by: Jian He <jian.universality@gmail.com> Author: Jian He <jian.universality@gmail.com> Author: Amit Langote <amitlangote09@gmail.com> Discussion: https://postgr.es/m/CACJufxEo4sUjKCYtda0_qt9tazqqKPmF1cqhW9KBOUeJFqQd2g@mail.gmail.com Backpatch-through: 17
Diffstat (limited to 'src/backend/executor/execExpr.c')
-rw-r--r--src/backend/executor/execExpr.c32
1 files changed, 26 insertions, 6 deletions
diff --git a/src/backend/executor/execExpr.c b/src/backend/executor/execExpr.c
index 63289ee35ee..c8077aa57bd 100644
--- a/src/backend/executor/execExpr.c
+++ b/src/backend/executor/execExpr.c
@@ -4411,9 +4411,11 @@ ExecInitJsonExpr(JsonExpr *jsexpr, ExprState *state,
List *jumps_return_null = NIL;
List *jumps_to_end = NIL;
ListCell *lc;
- ErrorSaveContext *escontext =
- jsexpr->on_error->btype != JSON_BEHAVIOR_ERROR ?
- &jsestate->escontext : NULL;
+ ErrorSaveContext *escontext;
+ bool returning_domain =
+ get_typtype(jsexpr->returning->typid) == TYPTYPE_DOMAIN;
+
+ Assert(jsexpr->on_error != NULL);
jsestate->jsexpr = jsexpr;
@@ -4491,6 +4493,9 @@ ExecInitJsonExpr(JsonExpr *jsexpr, ExprState *state,
scratch->d.constval.isnull = true;
ExprEvalPushStep(state, scratch);
+ escontext = jsexpr->on_error->btype != JSON_BEHAVIOR_ERROR ?
+ &jsestate->escontext : NULL;
+
/*
* To handle coercion errors softly, use the following ErrorSaveContext to
* pass to ExecInitExprRec() when initializing the coercion expressions
@@ -4562,9 +4567,18 @@ ExecInitJsonExpr(JsonExpr *jsexpr, ExprState *state,
* Step to check jsestate->error and return the ON ERROR expression if
* there is one. This handles both the errors that occur during jsonpath
* evaluation in EEOP_JSONEXPR_PATH and subsequent coercion evaluation.
+ *
+ * Speed up common cases by avoiding extra steps for a NULL-valued ON
+ * ERROR expression unless RETURNING a domain type, where constraints must
+ * be checked. ExecEvalJsonExprPath() already returns NULL on error,
+ * making additional steps unnecessary in typical scenarios. Note that the
+ * default ON ERROR behavior for JSON_VALUE() and JSON_QUERY() is to
+ * return NULL.
*/
- if (jsexpr->on_error &&
- jsexpr->on_error->btype != JSON_BEHAVIOR_ERROR)
+ if (jsexpr->on_error->btype != JSON_BEHAVIOR_ERROR &&
+ (!(IsA(jsexpr->on_error->expr, Const) &&
+ ((Const *) jsexpr->on_error->expr)->constisnull) ||
+ returning_domain))
{
ErrorSaveContext *saved_escontext;
@@ -4619,9 +4633,15 @@ ExecInitJsonExpr(JsonExpr *jsexpr, ExprState *state,
/*
* Step to check jsestate->empty and return the ON EMPTY expression if
* there is one.
+ *
+ * See the comment above for details on the optimization for NULL-valued
+ * expressions.
*/
if (jsexpr->on_empty != NULL &&
- jsexpr->on_empty->btype != JSON_BEHAVIOR_ERROR)
+ jsexpr->on_empty->btype != JSON_BEHAVIOR_ERROR &&
+ (!(IsA(jsexpr->on_empty->expr, Const) &&
+ ((Const *) jsexpr->on_empty->expr)->constisnull) ||
+ returning_domain))
{
ErrorSaveContext *saved_escontext;