postgres/timescaledb
1
0
Fork 0
mirror of https://github.com/timescale/timescaledb.git synced 2025-05-17 11:03:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor make_partfunc_call

Browse Source 
Refactor make_partfunc_call to only accept fnoid and rettype instead
of PartitioningFunc which also gets rid of a coverity warning about
that parameter being passed by value instead of reference because
that parameter was longer than 128 bytes.
This commit is contained in:
Sven Klemm 2022-06-13 08:35:16 +02:00 committed by Sven Klemm
parent 308ce8c47b
commit 1ac06c71c2
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/planner/space_constraint.c
View File

@ -117,11 +117,11 @@ is_valid_scalar_space_constraint(ScalarArrayOpExpr *op, List *rtable)
} }
static FuncExpr * static FuncExpr *
make_partfunc_call(PartitioningFunc partfunc, List *args, Oid inputcollid) make_partfunc_call(Oid funcid, Oid rettype, List *args, Oid inputcollid)
{ {
/* build FuncExpr to use in eval_const_expressions */ /* build FuncExpr to use in eval_const_expressions */
return makeFuncExpr(partfunc.func_fmgr.fn_oid /* funcid */, return makeFuncExpr(funcid /* funcid */,
partfunc.rettype /* rettype */, rettype /* rettype */,
args /* args */, args /* args */,
InvalidOid /* funccollid */, InvalidOid /* funccollid */,
inputcollid /* inputcollid */, inputcollid /* inputcollid */,
@ -141,11 +141,14 @@ transform_space_constraint(PlannerInfo *root, List *rtable, OpExpr *op)
Const *part_value; Const *part_value;
RangeTblEntry *rte = list_nth(rtable, var->varno - 1); RangeTblEntry *rte = list_nth(rtable, var->varno - 1);
Dimension *dim = get_space_dimension(rte->relid, var->varattno); Dimension *dim = get_space_dimension(rte->relid, var->varattno);
PartitioningFunc partfunc = dim->partitioning->partfunc; Oid rettype = dim->partitioning->partfunc.rettype;
TypeCacheEntry *tce = lookup_type_cache(partfunc.rettype, TYPECACHE_EQ_OPR); TypeCacheEntry *tce = lookup_type_cache(rettype, TYPECACHE_EQ_OPR);
/* build FuncExpr to use in eval_const_expressions */ /* build FuncExpr to use in eval_const_expressions */
FuncExpr *partcall = make_partfunc_call(partfunc, list_make1(value), var->varcollid); FuncExpr *partcall = make_partfunc_call(dim->partitioning->partfunc.func_fmgr.fn_oid,
rettype,
list_make1(value),
var->varcollid);
/* /*
* We should always be able to constify here * We should always be able to constify here
@ -178,13 +181,16 @@ transform_scalar_space_constraint(PlannerInfo *root, List *rtable, ScalarArrayOp
Var *var = linitial_node(Var, op->args); Var *var = linitial_node(Var, op->args);
RangeTblEntry *rte = list_nth(rtable, var->varno - 1); RangeTblEntry *rte = list_nth(rtable, var->varno - 1);
Dimension *dim = get_space_dimension(rte->relid, var->varattno); Dimension *dim = get_space_dimension(rte->relid, var->varattno);
PartitioningFunc partfunc = dim->partitioning->partfunc; Oid rettype = dim->partitioning->partfunc.rettype;
TypeCacheEntry *tce = lookup_type_cache(partfunc.rettype, TYPECACHE_EQ_OPR); TypeCacheEntry *tce = lookup_type_cache(rettype, TYPECACHE_EQ_OPR);
List *part_values = NIL; List *part_values = NIL;
ListCell *lc; ListCell *lc;
/* build FuncExpr to use in eval_const_expressions */ /* build FuncExpr to use in eval_const_expressions */
FuncExpr *partcall = make_partfunc_call(partfunc, NIL, var->varcollid); FuncExpr *partcall = make_partfunc_call(dim->partitioning->partfunc.func_fmgr.fn_oid,
rettype,
NIL,
var->varcollid);
foreach (lc, lsecond_node(ArrayExpr, op->args)->elements) foreach (lc, lsecond_node(ArrayExpr, op->args)->elements)
{ {
@ -206,8 +212,8 @@ transform_scalar_space_constraint(PlannerInfo *root, List *rtable, ScalarArrayOp
ArrayExpr *arr2 = makeNode(ArrayExpr); ArrayExpr *arr2 = makeNode(ArrayExpr);
arr2->array_collid = InvalidOid; arr2->array_collid = InvalidOid;
arr2->array_typeid = get_array_type(partfunc.rettype); arr2->array_typeid = get_array_type(rettype);
arr2->element_typeid = partfunc.rettype; arr2->element_typeid = rettype;
arr2->multidims = false; arr2->multidims = false;
arr2->location = -1; arr2->location = -1;
arr2->elements = part_values; arr2->elements = part_values;