open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dept of second thoughts: let's make sure that get_index_stats_hook is only

Browse Source 
applied to expression indexes, not to plain relations.  The original coding
in btcostestimate conflated the two cases, but it's not hard to use
get_relation_stats_hook instead when we're looking to the underlying relation.
REL8_5_ALPHA1_BRANCH
Tom Lane 17 years ago
parent 7b7df9f0b1
commit 2dbc0ca937
1 changed files with 46 additions and 23 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 69
      src/backend/utils/adt/selfuncs.c

69
src/backend/utils/adt/selfuncs.c
Unescape View File

@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.254 2008/09/28 19:51:40 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.255 2008/09/28 20:42:12 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -5777,40 +5777,63 @@ btcostestimate(PG_FUNCTION_ARGS)
if (found_saop) if (found_saop)
PG_RETURN_VOID(); PG_RETURN_VOID();
MemSet(&vardata, 0, sizeof(vardata));
if (index->indexkeys[0] != 0) if (index->indexkeys[0] != 0)
{ {
/* Simple variable --- look to stats for the underlying table */ /* Simple variable --- look to stats for the underlying table */
relid = getrelid(index->rel->relid, root->parse->rtable); RangeTblEntry *rte = planner_rt_fetch(index->rel->relid, root);
Assert(rte->rtekind == RTE_RELATION);
relid = rte->relid;
Assert(relid != InvalidOid); Assert(relid != InvalidOid);
colnum = index->indexkeys[0]; colnum = index->indexkeys[0];
if (get_relation_stats_hook &&
(*get_relation_stats_hook) (root, rte, colnum, &vardata))
{
/*
* The hook took control of acquiring a stats tuple. If it did
* supply a tuple, it'd better have supplied a freefunc.
*/
if (HeapTupleIsValid(vardata.statsTuple) &&
!vardata.freefunc)
elog(ERROR, "no function provided to release variable stats with");
}
else
{
vardata.statsTuple = SearchSysCache(STATRELATT,
ObjectIdGetDatum(relid),
Int16GetDatum(colnum),
0, 0);
vardata.freefunc = ReleaseSysCache;
}
} }
else else
{ {
/* Expression --- maybe there are stats for the index itself */ /* Expression --- maybe there are stats for the index itself */
relid = index->indexoid; relid = index->indexoid;
colnum = 1; colnum = 1;
}
MemSet(&vardata, 0, sizeof(vardata));
if (get_index_stats_hook && if (get_index_stats_hook &&
(*get_index_stats_hook) (root, relid, colnum, &vardata)) (*get_index_stats_hook) (root, relid, colnum, &vardata))
{ {
/* /*
* The hook took control of acquiring a stats tuple. If it did supply * The hook took control of acquiring a stats tuple. If it did
* a tuple, it'd better have supplied a freefunc. * supply a tuple, it'd better have supplied a freefunc.
*/ */
if (HeapTupleIsValid(vardata.statsTuple) && if (HeapTupleIsValid(vardata.statsTuple) &&
!vardata.freefunc) !vardata.freefunc)
elog(ERROR, "no function provided to release variable stats with"); elog(ERROR, "no function provided to release variable stats with");
} }
else else
{ {
vardata.statsTuple = SearchSysCache(STATRELATT, vardata.statsTuple = SearchSysCache(STATRELATT,
ObjectIdGetDatum(relid), ObjectIdGetDatum(relid),
Int16GetDatum(colnum), Int16GetDatum(colnum),
0, 0); 0, 0);
vardata.freefunc = ReleaseSysCache; vardata.freefunc = ReleaseSysCache;
}
} }
if (HeapTupleIsValid(vardata.statsTuple)) if (HeapTupleIsValid(vardata.statsTuple))

Write Preview
Loading…
Cancel
Save