fixup! Add subtransactions for JsonExpr execution

Author: Nikita Glukhov

src/backend/executor/execExpr.c

@@ -32,6 +32,7 @@
 
 #include "access/nbtree.h"
 #include "catalog/objectaccess.h"
+#include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "executor/execExpr.h"
 #include "executor/nodeSubplan.h"
@@ -73,6 +74,7 @@ static bool isAssignmentIndirectionExpr(Expr *expr);
 static void ExecInitCoerceToDomain(ExprEvalStep *scratch, CoerceToDomain *ctest,
 					   PlanState *parent, ExprState *state,
 					   Datum *resv, bool *resnull);
+static char getJsonExprVolatility(JsonExpr *jsexpr);
 
 
 /*
@@ -2800,3 +2802,105 @@ ExecInitCoerceToDomain(ExprEvalStep *scratch, CoerceToDomain *ctest,
 		}
 	}
 }
+
+
+static char
+getExprVolatility(Node *expr)
+{
+	if (contain_volatile_functions(expr))
+		return PROVOLATILE_VOLATILE;
+
+	if (contain_mutable_functions(expr))
+		return PROVOLATILE_STABLE;
+
+	return PROVOLATILE_IMMUTABLE;
+}
+
+static char
+getJsonCoercionVolatility(JsonCoercion *coercion, JsonReturning *returning)
+{
+	if (!coercion)
+		return PROVOLATILE_IMMUTABLE;
+
+	if (coercion->expr)
+		return getExprVolatility(coercion->expr);
+
+	if (coercion->via_io)
+	{
+		Oid			typinput;
+		Oid			typioparam;
+
+		getTypeInputInfo(returning->typid, &typinput, &typioparam);
+
+		return func_volatile(typinput);
+	}
+
+	if (coercion->via_populate)
+		return PROVOLATILE_STABLE;
+
+	return PROVOLATILE_IMMUTABLE;
+}
+
+static char
+getJsonExprVolatility(JsonExpr *jsexpr)
+{
+	char		volatility;
+	char		volatility2;
+	ListCell   *lc;
+
+	volatility = getExprVolatility(jsexpr->formatted_expr);
+
+	if (volatility == PROVOLATILE_VOLATILE)
+		return PROVOLATILE_VOLATILE;
+
+	volatility2 = getJsonCoercionVolatility(jsexpr->result_coercion,
+											&jsexpr->returning);
+
+	if (volatility2 == PROVOLATILE_VOLATILE)
+		return PROVOLATILE_VOLATILE;
+
+	if (volatility2 == PROVOLATILE_STABLE)
+		volatility = PROVOLATILE_STABLE;
+
+	if (jsexpr->coercions)
+	{
+		JsonCoercion **coercion;
+
+		for (coercion = &jsexpr->coercions->null;
+			 coercion <= &jsexpr->coercions->composite;
+			 coercion++)
+		{
+			volatility2 = getJsonCoercionVolatility(*coercion, &jsexpr->returning);
+
+			if (volatility2 == PROVOLATILE_VOLATILE)
+				return PROVOLATILE_VOLATILE;
+
+			if (volatility2 == PROVOLATILE_STABLE)
+				volatility = PROVOLATILE_STABLE;
+		}
+	}
+
+	if (jsexpr->on_empty.btype == JSON_BEHAVIOR_DEFAULT)
+	{
+		volatility2 = getExprVolatility(jsexpr->on_empty.default_expr);
+
+		if (volatility2 == PROVOLATILE_VOLATILE)
+			return PROVOLATILE_VOLATILE;
+
+		if (volatility2 == PROVOLATILE_STABLE)
+			volatility = PROVOLATILE_STABLE;
+	}
+
+	foreach(lc, jsexpr->passing.values)
+	{
+		volatility2 = getExprVolatility(lfirst(lc));
+
+		if (volatility2 == PROVOLATILE_VOLATILE)
+			return PROVOLATILE_VOLATILE;
+
+		if (volatility2 == PROVOLATILE_STABLE)
+			volatility = PROVOLATILE_STABLE;
+	}
+
+	return volatility;
+}

src/backend/parser/parse_expr.c

@@ -22,7 +22,6 @@
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
-#include "optimizer/clauses.h"
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
 #include "parser/analyze.h"
@@ -4718,105 +4717,3 @@ transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *func)
 
 	return (Node *) jsexpr;
 }
-
-static char
-getExprVolatility(Node *expr)
-{
-	if (contain_volatile_functions(expr))
-		return PROVOLATILE_VOLATILE;
-
-	if (contain_mutable_functions(expr))
-		return PROVOLATILE_STABLE;
-
-	return PROVOLATILE_IMMUTABLE;
-}
-
-static char
-getJsonCoercionVolatility(JsonCoercion *coercion, JsonReturning *returning)
-{
-	if (!coercion)
-		return PROVOLATILE_IMMUTABLE;
-
-	if (coercion->expr)
-		return getExprVolatility(coercion->expr);
-
-	if (coercion->via_io)
-	{
-		Oid			typinput;
-		Oid			typioparam;
-
-		getTypeInputInfo(returning->typid, &typinput, &typioparam);
-
-		return func_volatile(typinput);
-	}
-
-	if (coercion->via_populate)
-		return PROVOLATILE_STABLE;
-
-	return PROVOLATILE_IMMUTABLE;
-}
-
-char
-getJsonExprVolatility(JsonExpr *jsexpr)
-{
-	char		volatility;
-	char		volatility2;
-	ListCell   *lc;
-
-	volatility = getExprVolatility(jsexpr->formatted_expr);
-
-	if (volatility == PROVOLATILE_VOLATILE)
-		return PROVOLATILE_VOLATILE;
-
-	volatility2 = getJsonCoercionVolatility(jsexpr->result_coercion,
-											&jsexpr->returning);
-
-	if (volatility2 == PROVOLATILE_VOLATILE)
-		return PROVOLATILE_VOLATILE;
-
-	if (volatility2 == PROVOLATILE_STABLE)
-		volatility = PROVOLATILE_STABLE;
-
-	if (jsexpr->coercions)
-	{
-		JsonCoercion **coercion;
-
-		for (coercion = &jsexpr->coercions->null;
-			 coercion <= &jsexpr->coercions->composite;
-			 coercion++)
-		{
-			volatility2 = getJsonCoercionVolatility(*coercion, &jsexpr->returning);
-
-			if (volatility2 == PROVOLATILE_VOLATILE)
-				return PROVOLATILE_VOLATILE;
-
-			if (volatility2 == PROVOLATILE_STABLE)
-				volatility = PROVOLATILE_STABLE;
-		}
-	}
-
-	if (jsexpr->on_empty.btype == JSON_BEHAVIOR_DEFAULT)
-	{
-		volatility2 = getExprVolatility(jsexpr->on_empty.default_expr);
-
-		if (volatility2 == PROVOLATILE_VOLATILE)
-			return PROVOLATILE_VOLATILE;
-
-		if (volatility2 == PROVOLATILE_STABLE)
-			volatility = PROVOLATILE_STABLE;
-	}
-
-	foreach(lc, jsexpr->passing.values)
-	{
-		volatility2 = getExprVolatility(lfirst(lc));
-
-		if (volatility2 == PROVOLATILE_VOLATILE)
-			return PROVOLATILE_VOLATILE;
-
-		if (volatility2 == PROVOLATILE_STABLE)
-			volatility = PROVOLATILE_STABLE;
-	}
-
-	return volatility;
-}
-