From fcf040b589ffc318cbbc060deec296577b3ff24b Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Tue, 22 May 2018 09:05:38 +0300 Subject: [PATCH 2/3] Remove some unused code. --- src/backend/executor/nodeSubplan.c | 10 ---------- src/include/nodes/execnodes.h | 1 - 2 files changed, 11 deletions(-) diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index aab1c7942a..909f77905c 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -802,7 +802,6 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent) sstate->keyColIdx = NULL; sstate->tab_eq_funcoids = NULL; sstate->tab_hash_funcs = NULL; - sstate->tab_eq_funcs = NULL; sstate->lhs_hash_funcs = NULL; sstate->cur_eq_funcs = NULL; @@ -900,7 +899,6 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent) lefttlist = righttlist = NIL; sstate->tab_eq_funcoids = (Oid *) palloc(ncols * sizeof(Oid)); sstate->tab_hash_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo)); - sstate->tab_eq_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo)); sstate->lhs_hash_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo)); sstate->cur_eq_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo)); i = 1; @@ -909,7 +907,6 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent) OpExpr *opexpr = lfirst_node(OpExpr, l); Expr *expr; TargetEntry *tle; - Oid rhs_eq_oper; Oid left_hashfn; Oid right_hashfn; @@ -936,13 +933,6 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent) fmgr_info(opexpr->opfuncid, &sstate->cur_eq_funcs[i - 1]); fmgr_info_set_expr((Node *) opexpr, &sstate->cur_eq_funcs[i - 1]); - /* Look up the equality function for the RHS type */ - if (!get_compatible_hash_operators(opexpr->opno, - NULL, &rhs_eq_oper)) - elog(ERROR, "could not find compatible hash operator for operator %u", - opexpr->opno); - fmgr_info(get_opcode(rhs_eq_oper), &sstate->tab_eq_funcs[i - 1]); - /* Lookup the associated hash functions */ if (!get_op_hash_functions(opexpr->opno, &left_hashfn, &right_hashfn)) diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index da7f52cab0..1f3c786b30 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -839,7 +839,6 @@ typedef struct SubPlanState Oid *tab_eq_funcoids; /* equality func oids for table * datatype(s) */ FmgrInfo *tab_hash_funcs; /* hash functions for table datatype(s) */ - FmgrInfo *tab_eq_funcs; /* equality functions for table datatype(s) */ FmgrInfo *lhs_hash_funcs; /* hash functions for lefthand datatype(s) */ FmgrInfo *cur_eq_funcs; /* equality functions for LHS vs. table */ ExprState *cur_eq_comp; /* equality comparator for LHS vs. table */ -- 2.11.0