Skip to content

Commit 83772cc

Browse files
committed
Free memory after building each statistics object
Until now, all extended statistics on a given relation were built in the same memory context, without resetting. Some of the memory was released explicitly, but not all of it - for example memory allocated while detoasting values is hard to free. This is how it worked since extended statistics were introduced in PostgreSQL 10, but adding support for extended stats on expressions made the issue somewhat worse as it increases the number of statistics to build. Fixed by adding a memory context which gets reset after building each statistics object (all the statistics kinds included in it). Resetting it after building each statistics kind would be even better, but it would require more invasive changes and copying of results, making it harder to backpatch. Backpatch to PostgreSQL 10, where extended statistics were introduced. Author: Justin Pryzby Reported-by: Justin Pryzby Reviewed-by: Tomas Vondra Backpatch-through: 10 Discussion: https://www.postgresql.org/message-id/20210915200928.GP831%40telsasoft.com
1 parent c7aeb77 commit 83772cc

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

src/backend/statistics/extended_stats.c

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,16 @@ BuildRelationExtStatistics(Relation onerel, double totalrows,
125125
if (!natts)
126126
return;
127127

128+
/* the list of stats has to be allocated outside the memory context */
129+
pg_stext = table_open(StatisticExtRelationId, RowExclusiveLock);
130+
statslist = fetch_statentries_for_relation(pg_stext, RelationGetRelid(onerel));
131+
132+
/* memory context for building each statistics object */
128133
cxt = AllocSetContextCreate(CurrentMemoryContext,
129134
"BuildRelationExtStatistics",
130135
ALLOCSET_DEFAULT_SIZES);
131136
oldcxt = MemoryContextSwitchTo(cxt);
132137

133-
pg_stext = table_open(StatisticExtRelationId, RowExclusiveLock);
134-
statslist = fetch_statentries_for_relation(pg_stext, RelationGetRelid(onerel));
135-
136138
/* report this phase */
137139
if (statslist != NIL)
138140
{
@@ -234,14 +236,16 @@ BuildRelationExtStatistics(Relation onerel, double totalrows,
234236
pgstat_progress_update_param(PROGRESS_ANALYZE_EXT_STATS_COMPUTED,
235237
++ext_cnt);
236238

237-
/* free the build data (allocated as a single chunk) */
238-
pfree(data);
239+
/* free the data used for building this statistics object */
240+
MemoryContextReset(cxt);
239241
}
240242

241-
table_close(pg_stext, RowExclusiveLock);
242-
243243
MemoryContextSwitchTo(oldcxt);
244244
MemoryContextDelete(cxt);
245+
246+
list_free(statslist);
247+
248+
table_close(pg_stext, RowExclusiveLock);
245249
}
246250

247251
/*

0 commit comments

Comments
 (0)