From 1fdb7f9789c4550204cd62d1746a7deed1dc4c29 Mon Sep 17 00:00:00 2001
From: Andres Freund
Date: Thu, 6 Feb 2020 19:06:16 -0800
Subject: expression eval: Don't redundantly keep track of AggState.

It's already tracked via ExprState->parent, so we don't need to also
include it in ExprEvalStep. When that code originally was written
ExprState->parent didn't exist, but it since has been introduced in
6719b238e8f.

Author: Andres Freund
Discussion: https://postgr.es/m/20191023163849.sosqbfs5yenocez3@alap3.anarazel.de
---
 src/include/executor/execExpr.h | 5 -----
 src/include/nodes/execnodes.h   | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/include')

diff --git a/src/include/executor/execExpr.h b/src/include/executor/execExpr.h
index 7112558363f..73a2ca8c6dd 100644
--- a/src/include/executor/execExpr.h
+++ b/src/include/executor/execExpr.h
@@ -569,7 +569,6 @@ typedef struct ExprEvalStep
 		/* for EEOP_GROUPING_FUNC */
 		struct
 		{
-			AggState   *parent; /* parent Agg */
 			List	   *clauses;	/* integer list of column numbers */
 		}			grouping_func;
 
@@ -597,7 +596,6 @@ typedef struct ExprEvalStep
 		/* for EEOP_AGG_*DESERIALIZE */
 		struct
 		{
-			AggState   *aggstate;
 			FunctionCallInfo fcinfo_data;
 			int			jumpnull;
 		}			agg_deserialize;
@@ -625,7 +623,6 @@ typedef struct ExprEvalStep
 		/* for EEOP_AGG_INIT_TRANS */
 		struct
 		{
-			AggState   *aggstate;
 			AggStatePerTrans pertrans;
 			ExprContext *aggcontext;
 			int			setno;
@@ -637,7 +634,6 @@ typedef struct ExprEvalStep
 		/* for EEOP_AGG_STRICT_TRANS_CHECK */
 		struct
 		{
-			AggState   *aggstate;
 			int			setno;
 			int			transno;
 			int			setoff;
@@ -647,7 +643,6 @@ typedef struct ExprEvalStep
 		/* for EEOP_AGG_{PLAIN,ORDERED}_TRANS* */
 		struct
 		{
-			AggState   *aggstate;
 			AggStatePerTrans pertrans;
 			ExprContext *aggcontext;
 			int			setno;
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 1f6f5bbc207..5d5b38b8799 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -104,6 +104,7 @@ typedef struct ExprState
 	int			steps_len;		/* number of steps currently */
 	int			steps_alloc;	/* allocated length of steps array */
 
+#define FIELDNO_EXPRSTATE_PARENT 11
 	struct PlanState *parent;	/* parent PlanState node, if any */
 	ParamListInfo ext_params;	/* for compiling PARAM_EXTERN nodes */
 
-- 
cgit v1.2.3