diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/executor/executor.h | 2 | ||||
| -rw-r--r-- | src/include/nodes/plannodes.h | 6 | ||||
| -rw-r--r-- | src/include/optimizer/optimizer.h | 1 | ||||
| -rw-r--r-- | src/include/optimizer/planmain.h | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 086f52cff3d..fa2b657fb2f 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -138,7 +138,7 @@ extern TupleHashTable BuildTupleHashTable(PlanState *parent, const Oid *eqfuncoids, FmgrInfo *hashfunctions, Oid *collations, - long nbuckets, + double nelements, Size additionalsize, MemoryContext metacxt, MemoryContext tuplescxt, diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index 7cdd2b51c94..c4393a94321 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -475,7 +475,7 @@ typedef struct RecursiveUnion Oid *dupCollations pg_node_attr(array_size(numCols)); /* estimated number of groups in input */ - long numGroups; + Cardinality numGroups; } RecursiveUnion; /* ---------------- @@ -1206,7 +1206,7 @@ typedef struct Agg Oid *grpCollations pg_node_attr(array_size(numCols)); /* estimated number of groups in input */ - long numGroups; + Cardinality numGroups; /* for pass-by-ref transition data */ uint64 transitionSpace; @@ -1446,7 +1446,7 @@ typedef struct SetOp bool *cmpNullsFirst pg_node_attr(array_size(numCols)); /* estimated number of groups in left input */ - long numGroups; + Cardinality numGroups; } SetOp; /* ---------------- diff --git a/src/include/optimizer/optimizer.h b/src/include/optimizer/optimizer.h index a34113903c0..d0aa8ab0c1c 100644 --- a/src/include/optimizer/optimizer.h +++ b/src/include/optimizer/optimizer.h @@ -82,7 +82,6 @@ extern PGDLLIMPORT int effective_cache_size; extern double clamp_row_est(double nrows); extern int32 clamp_width_est(int64 tuple_width); -extern long clamp_cardinality_to_long(Cardinality x); /* in path/indxpath.c: */ diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index 09b48b26f8f..00addf15992 100644 --- a/src/include/optimizer/planmain.h +++ b/src/include/optimizer/planmain.h @@ -55,7 +55,7 @@ extern Sort *make_sort_from_sortclauses(List *sortcls, Plan *lefttree); extern Agg *make_agg(List *tlist, List *qual, AggStrategy aggstrategy, AggSplit aggsplit, int numGroupCols, AttrNumber *grpColIdx, Oid *grpOperators, Oid *grpCollations, - List *groupingSets, List *chain, double dNumGroups, + List *groupingSets, List *chain, Cardinality numGroups, Size transitionSpace, Plan *lefttree); extern Limit *make_limit(Plan *lefttree, Node *limitOffset, Node *limitCount, LimitOption limitOption, int uniqNumCols, |