From cd0a3398fd6cb586d373bba3d988e564ee7e8c5a Mon Sep 17 00:00:00 2001 From: Tomas Vondra Date: Tue, 21 Sep 2021 01:13:11 +0200 Subject: [PATCH 2/3] build dependencies in context --- src/backend/statistics/dependencies.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c index d703e9b9ba..4efba06fd6 100644 --- a/src/backend/statistics/dependencies.c +++ b/src/backend/statistics/dependencies.c @@ -30,6 +30,7 @@ #include "utils/fmgroids.h" #include "utils/fmgrprotos.h" #include "utils/lsyscache.h" +#include "utils/memutils.h" #include "utils/selfuncs.h" #include "utils/syscache.h" #include "utils/typcache.h" @@ -325,12 +326,6 @@ dependency_degree(StatsBuildData *data, int k, AttrNumber *dependency) group_size++; } - if (items) - pfree(items); - - pfree(mss); - pfree(attnums_dep); - /* Compute the 'degree of validity' as (supporting/total). */ return (n_supporting_rows * 1.0 / data->numrows); } @@ -359,9 +354,14 @@ statext_dependencies_build(StatsBuildData *data) /* result */ MVDependencies *dependencies = NULL; + MemoryContext cxt; Assert(data->nattnums >= 2); + cxt = AllocSetContextCreate(CurrentMemoryContext, + "sorted items cxt", + ALLOCSET_DEFAULT_SIZES); + /* * We'll try build functional dependencies starting from the smallest ones * covering just 2 columns, to the largest ones, covering all columns @@ -380,10 +380,16 @@ statext_dependencies_build(StatsBuildData *data) { double degree; MVDependency *d; + MemoryContext oldcxt; + + oldcxt = MemoryContextSwitchTo(cxt); /* compute how valid the dependency seems */ degree = dependency_degree(data, k, dependency); + MemoryContextSwitchTo(oldcxt); + MemoryContextReset(cxt); + /* * if the dependency seems entirely invalid, don't store it */ -- 2.31.1