Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit b7d35d3

Browse files
committed
Remove some unnecessary fields from executor nodes.
JsonExprState.input_finfo is only assigned to, never read, and it's really fairly useless since the value can be gotten out of the adjacent input_fcinfo field. Let's remove it before someone starts to depend on it. While here, also remove TidScanState.tss_htup and AggState.combinedproj, which are referenced nowhere. Those should have been removed by the commits that caused them to become disused, but were not. I don't think a catversion bump is necessary here, since plan trees are never stored on disk. Matthias van de Meent Discussion: https://postgr.es/m/CAEze2WjsY4d0TBymLNGK4zpttUcg_YZaTjyWz2VfDUV6YH8wXQ@mail.gmail.com
1 parent 598e011 commit b7d35d3

File tree

2 files changed

+0
-5
lines changed

2 files changed

+0
-5
lines changed

src/backend/executor/execExpr.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4393,7 +4393,6 @@ ExecInitJsonExpr(JsonExpr *jsexpr, ExprState *state,
43934393
fcinfo->args[2].isnull = false;
43944394
fcinfo->context = (Node *) escontext;
43954395

4396-
jsestate->input_finfo = finfo;
43974396
jsestate->input_fcinfo = fcinfo;
43984397
}
43994398

src/include/nodes/execnodes.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,6 @@ typedef struct JsonExprState
10701070
* RETURNING type input function invocation info when
10711071
* JsonExpr.use_io_coercion is true.
10721072
*/
1073-
FmgrInfo *input_finfo;
10741073
FunctionCallInfo input_fcinfo;
10751074

10761075
/*
@@ -1835,7 +1834,6 @@ typedef struct BitmapHeapScanState
18351834
* NumTids number of tids in this scan
18361835
* TidPtr index of currently fetched tid
18371836
* TidList evaluated item pointers (array of size NumTids)
1838-
* htup currently-fetched tuple, if any
18391837
* ----------------
18401838
*/
18411839
typedef struct TidScanState
@@ -1846,7 +1844,6 @@ typedef struct TidScanState
18461844
int tss_NumTids;
18471845
int tss_TidPtr;
18481846
ItemPointerData *tss_TidList;
1849-
HeapTupleData tss_htup;
18501847
} TidScanState;
18511848

18521849
/* ----------------
@@ -2530,7 +2527,6 @@ typedef struct AggState
25302527
#define FIELDNO_AGGSTATE_ALL_PERGROUPS 53
25312528
AggStatePerGroup *all_pergroups; /* array of first ->pergroups, than
25322529
* ->hash_pergroup */
2533-
ProjectionInfo *combinedproj; /* projection machinery */
25342530
SharedAggInfo *shared_info; /* one entry per worker */
25352531
} AggState;
25362532

0 commit comments

Comments
 (0)