Commit3974bc3

committed

Remove unused field from SubPlanState struct

bf6c614 did some conversion work to use ExprState instead of manuallycalling equality functions to check if one set of values is not distinctfrom another set. That patch removed many of the fields that becameredundant as a result of that change, but it forgot to removeSubPlanState.tab_eq_funcs. Fix that.In passing, fix the header comment for TupleHashEntryData to correctlyspell the field name it's talking about.Author: Rafia Sabih <rafia.pghackers@gmail.com>Reviewed-by: Andrei Lepikhov <lepihov@gmail.com>Discussion:https://postgr.es/m/CA+FpmFeycdombFzrjZw7Rmc29CVm4OOzCWwu=dVBQ6q=PX8SvQ@mail.gmail.comDiscussion:https://postgr.es/m/CAApHDvrWR2jYVhec=COyF2g2BE_ns91NDsCHAMFiXbyhEujKdQ@mail.gmail.com

1 parentbaa1ae0 commit3974bc3Copy full SHA for 3974bc3

File tree

-6

lines changed

-6

lines changed

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -856,7 +856,6 @@ ExecInitSubPlan(SubPlan subplan, PlanState parent)`
`856`	`856`	`sstate->keyColIdx=NULL;`
`857`	`857`	`sstate->tab_eq_funcoids=NULL;`
`858`	`858`	`sstate->tab_hash_funcs=NULL;`
`859`		`-sstate->tab_eq_funcs=NULL;`
`860`	`859`	`sstate->tab_collations=NULL;`
`861`	`860`	`sstate->lhs_hash_funcs=NULL;`
`862`	`861`	`sstate->cur_eq_funcs=NULL;`
`@@ -954,7 +953,6 @@ ExecInitSubPlan(SubPlan subplan, PlanState parent)`
`954`	`953`	`sstate->tab_eq_funcoids= (Oid)palloc(ncolssizeof(Oid));`
`955`	`954`	`sstate->tab_collations= (Oid)palloc(ncolssizeof(Oid));`
`956`	`955`	`sstate->tab_hash_funcs= (FmgrInfo)palloc(ncolssizeof(FmgrInfo));`
`957`		`-sstate->tab_eq_funcs= (FmgrInfo)palloc(ncolssizeof(FmgrInfo));`
`958`	`956`	`sstate->lhs_hash_funcs= (FmgrInfo)palloc(ncolssizeof(FmgrInfo));`
`959`	`957`	`sstate->cur_eq_funcs= (FmgrInfo)palloc(ncolssizeof(FmgrInfo));`
`960`	`958`	`/* we'll need the cross-type equality fns below, but not in sstate */`
`@@ -999,8 +997,6 @@ ExecInitSubPlan(SubPlan subplan, PlanState parent)`
`999`	`997`	`elog(ERROR,"could not find compatible hash operator for operator %u",`
`1000`	`998`	`opexpr->opno);`
`1001`	`999`	`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]);`
`1004`	`1000`
`1005`	`1001`	`/* Lookup the associated hash functions */`
`1006`	`1002`	`if (!get_op_hash_functions(opexpr->opno,`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -796,7 +796,7 @@ typedef struct ExecAuxRowMark`
`796`	`796`	`* All-in-memory tuple hash tables are used for a number of purposes.`
`797`	`797`	`*`
`798`	`798`	`* Note: tab_hash_funcs are for the key datatype(s) stored in the table,`
`799`		`- * andtab_eq_funcs are non-cross-type equality operators for those types.`
	`799`	`+ * andtab_eq_func are non-cross-type equality operators for those types.`
`800`	`800`	`* Normally these are the only functions used, but FindTupleHashEntry()`
`801`	`801`	`* supports searching a hashtable using cross-data-type hashing. For that,`
`802`	`802`	`* the caller must supply hash functions for the LHS datatype as well as`
`@@ -994,7 +994,6 @@ typedef struct SubPlanState`
`994`	`994`	`* datatype(s) */`
`995`	`995`	`Oidtab_collations;/ collations for hash and comparison */`
`996`	`996`	`FmgrInfotab_hash_funcs;/ hash functions for table datatype(s) */`
`997`		`-FmgrInfotab_eq_funcs;/ equality functions for table datatype(s) */`
`998`	`997`	`FmgrInfolhs_hash_funcs;/ hash functions for lefthand datatype(s) */`
`999`	`998`	`FmgrInfocur_eq_funcs;/ equality functions for LHS vs. table */`
`1000`	`999`	`ExprStatecur_eq_comp;/ equality comparator for LHS vs. table */`

Comments

(0)