Skip to content

Commit 3974bc3

Browse files
committed
Remove unused field from SubPlanState struct
bf6c614 did some conversion work to use ExprState instead of manually calling equality functions to check if one set of values is not distinct from another set. That patch removed many of the fields that became redundant as a result of that change, but it forgot to remove SubPlanState.tab_eq_funcs. Fix that. In passing, fix the header comment for TupleHashEntryData to correctly spell the field name it's talking about. Author: Rafia Sabih <[email protected]> Reviewed-by: Andrei Lepikhov <[email protected]> Discussion: https://postgr.es/m/CA+FpmFeycdombFzrjZw7Rmc29CVm4OOzCWwu=dVBQ6q=PX8SvQ@mail.gmail.com Discussion: https://postgr.es/m/CAApHDvrWR2jYVhec=COyF2g2BE_ns91NDsCHAMFiXbyhEujKdQ@mail.gmail.com
1 parent baa1ae0 commit 3974bc3

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

src/backend/executor/nodeSubplan.c

-4
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,6 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent)
856856
sstate->keyColIdx = NULL;
857857
sstate->tab_eq_funcoids = NULL;
858858
sstate->tab_hash_funcs = NULL;
859-
sstate->tab_eq_funcs = NULL;
860859
sstate->tab_collations = NULL;
861860
sstate->lhs_hash_funcs = NULL;
862861
sstate->cur_eq_funcs = NULL;
@@ -954,7 +953,6 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent)
954953
sstate->tab_eq_funcoids = (Oid *) palloc(ncols * sizeof(Oid));
955954
sstate->tab_collations = (Oid *) palloc(ncols * sizeof(Oid));
956955
sstate->tab_hash_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo));
957-
sstate->tab_eq_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo));
958956
sstate->lhs_hash_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo));
959957
sstate->cur_eq_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo));
960958
/* we'll need the cross-type equality fns below, but not in sstate */
@@ -999,8 +997,6 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent)
999997
elog(ERROR, "could not find compatible hash operator for operator %u",
1000998
opexpr->opno);
1001999
sstate->tab_eq_funcoids[i - 1] = get_opcode(rhs_eq_oper);
1002-
fmgr_info(sstate->tab_eq_funcoids[i - 1],
1003-
&sstate->tab_eq_funcs[i - 1]);
10041000

10051001
/* Lookup the associated hash functions */
10061002
if (!get_op_hash_functions(opexpr->opno,

src/include/nodes/execnodes.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ typedef struct ExecAuxRowMark
796796
* All-in-memory tuple hash tables are used for a number of purposes.
797797
*
798798
* Note: tab_hash_funcs are for the key datatype(s) stored in the table,
799-
* and tab_eq_funcs are non-cross-type equality operators for those types.
799+
* and tab_eq_func are non-cross-type equality operators for those types.
800800
* Normally these are the only functions used, but FindTupleHashEntry()
801801
* supports searching a hashtable using cross-data-type hashing. For that,
802802
* the caller must supply hash functions for the LHS datatype as well as
@@ -994,7 +994,6 @@ typedef struct SubPlanState
994994
* datatype(s) */
995995
Oid *tab_collations; /* collations for hash and comparison */
996996
FmgrInfo *tab_hash_funcs; /* hash functions for table datatype(s) */
997-
FmgrInfo *tab_eq_funcs; /* equality functions for table datatype(s) */
998997
FmgrInfo *lhs_hash_funcs; /* hash functions for lefthand datatype(s) */
999998
FmgrInfo *cur_eq_funcs; /* equality functions for LHS vs. table */
1000999
ExprState *cur_eq_comp; /* equality comparator for LHS vs. table */

0 commit comments

Comments
 (0)