]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Release memory allocated by dependency_degree
authorTomas Vondra <tomas.vondra@postgresql.org>
Mon, 20 Sep 2021 23:13:11 +0000 (01:13 +0200)
committerTomas Vondra <tomas.vondra@postgresql.org>
Thu, 23 Sep 2021 16:48:58 +0000 (18:48 +0200)
Calculating degree of a functional dependency may allocate a lot of
memory - we have released mot of the explicitly allocated memory, but
e.g. detoasted varlena values were left behind. That may be an issue,
because we consider a lot of dependencies (all combinations), and the
detoasting may happen for each one again.

Fixed by calling dependency_degree() in a dedicated context, and
resetting it after each call. We only need the calculated dependency
degree, so we don't need to copy anything.

Backpatch to PostgreSQL 10, where extended statistics were introduced.

Backpatch-through: 10
Discussion: https://www.postgresql.org/message-id/20210915200928.GP831%40telsasoft.com

src/backend/statistics/dependencies.c

index e7f2d6c0ca75b87b68d3782ab52759160e233862..445a0db7c5ee3c638511e233eec6f68af05360ff 100644 (file)
@@ -29,6 +29,8 @@
 #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"
 
@@ -321,11 +323,6 @@ dependency_degree(int numrows, HeapTuple *rows, int k, AttrNumber *dependency,
                group_size++;
        }
 
-       pfree(items);
-       pfree(values);
-       pfree(isnull);
-       pfree(mss);
-
        /* Compute the 'degree of validity' as (supporting/total). */
        return (n_supporting_rows * 1.0 / numrows);
 }
@@ -358,6 +355,7 @@ statext_dependencies_build(int numrows, HeapTuple *rows, Bitmapset *attrs,
 
        /* result */
        MVDependencies *dependencies = NULL;
+       MemoryContext   cxt;
 
        numattrs = bms_num_members(attrs);
 
@@ -372,6 +370,11 @@ statext_dependencies_build(int numrows, HeapTuple *rows, Bitmapset *attrs,
 
        Assert(numattrs >= 2);
 
+       /* tracks memory allocated by dependency_degree calls */
+       cxt = AllocSetContextCreate(CurrentMemoryContext,
+                                                               "dependency_degree 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
@@ -390,10 +393,17 @@ statext_dependencies_build(int numrows, HeapTuple *rows, Bitmapset *attrs,
                {
                        double          degree;
                        MVDependency *d;
+                       MemoryContext oldcxt;
+
+                       /* release memory used by dependency degree calculation */
+                       oldcxt = MemoryContextSwitchTo(cxt);
 
                        /* compute how valid the dependency seems */
                        degree = dependency_degree(numrows, rows, k, dependency, stats, attrs);
 
+                       MemoryContextSwitchTo(oldcxt);
+                       MemoryContextReset(cxt);
+
                        /*
                         * if the dependency seems entirely invalid, don't store it
                         */
@@ -435,6 +445,8 @@ statext_dependencies_build(int numrows, HeapTuple *rows, Bitmapset *attrs,
                DependencyGenerator_free(DependencyGenerator);
        }
 
+       MemoryContextDelete(cxt);
+
        return dependencies;
 }