From: Andrew Gierth <andrew@tao11.riddles.org.uk>
To: Alexander Korotkov <a.korotkov@postgrespro.ru>
Cc: pgsql-bugs@lists.postgresql.org, Teodor Sigaev <teodor@sigaev.ru>
Subject: Re: BUG #15378: SP-GIST memory context screwup?
Date: Tue, 11 Sep 2018 17:31:24 +0100
Message-ID: <87tvmwov48.fsf@news-spur.riddles.org.uk> (raw)
In-Reply-To: <87y3c8oy1g.fsf@news-spur.riddles.org.uk>
References: <153663176628.23136.11901365223750051490@wrigleys.postgresql.org>
<87bm94rba5.fsf@news-spur.riddles.org.uk>
<CAPpHfdvbVMjB7ORQeXRxMX65u7P-TfG66bZh5U7+3j2QTAov-A@mail.gmail.com>
<87y3c8oy1g.fsf@news-spur.riddles.org.uk>
>>>>> "Andrew" == Andrew Gierth <andrew@tao11.riddles.org.uk> writes:
Andrew> So the simplest fix would be to move the memory context reset
Andrew> to just after the freeScanStack in resetSpGistScanOpaque. And
Andrew> with retail freeing going on during the scan, it makes less
Andrew> sense to try and avoid it during rescan, double ugh.
Proposed patch attached.
--
Andrew (irc:RhodiumToad)
Attachments:spgmem.patch (text/x-patch, 3.1K) downloaddiff --git a/src/backend/access/spgist/spgscan.c b/src/backend/access/spgist/spgscan.cindex c728080812..5260d5017d 100644--- a/src/backend/access/spgist/spgscan.c+++ b/src/backend/access/spgist/spgscan.c@@ -74,6 +74,13 @@ resetSpGistScanOpaque(SpGistScanOpaque so)
freeScanStack(so);
+ /*+ * clear traversal context before proceeding to the next scan; this must+ * not happen before the freeScanStack above, else we get double-free+ * crashes.+ */+ MemoryContextReset(so->traversalCxt);+
if (so->searchNulls)
{
/* Stack a work item to scan the null index entries */
@@ -212,9 +219,6 @@ spgrescan(IndexScanDesc scan, ScanKey scankey, int nscankeys,
{
SpGistScanOpaque so = (SpGistScanOpaque) scan->opaque;
- /* clear traversal context before proceeding to the next scan */- MemoryContextReset(so->traversalCxt);-
/* copy scankeys into local storage */
if (scankey && scan->numberOfKeys > 0)
{
diff --git a/src/test/regress/expected/spgist.out b/src/test/regress/expected/spgist.outindex 2d75bbf8dc..9364b88bc2 100644--- a/src/test/regress/expected/spgist.out+++ b/src/test/regress/expected/spgist.out@@ -23,6 +23,24 @@ delete from spgist_point_tbl where id % 2 = 1;
-- would exercise it)
delete from spgist_point_tbl where id < 10000;
vacuum spgist_point_tbl;
+-- Test rescan paths (cf. bug #15378)+-- use box and && rather than point, so that rescan happens when the+-- traverse stack is non-empty+create table spgist_box_tbl(id serial, b box);+insert into spgist_box_tbl(b)+select box(point(i,j),point(i+s,j+s))+ from generate_series(1,100,5) i,+ generate_series(1,100,5) j,+ generate_series(1,10) s;+create index spgist_box_idx on spgist_box_tbl using spgist (b);+select count(*)+ from (values (point(5,5)),(point(8,8)),(point(12,12))) v(p)+ where exists(select * from spgist_box_tbl b where b.b && box(v.p,v.p));+ count +-------+ 3+(1 row)+
-- The point opclass's choose method only uses the spgMatchNode action,
-- so the other actions are not tested by the above. Create an index using
-- text opclass, which uses the others actions.
diff --git a/src/test/regress/sql/spgist.sql b/src/test/regress/sql/spgist.sqlindex 77b43a2d3e..c72cf42a33 100644--- a/src/test/regress/sql/spgist.sql+++ b/src/test/regress/sql/spgist.sql@@ -30,6 +30,21 @@ delete from spgist_point_tbl where id < 10000;
vacuum spgist_point_tbl;
+-- Test rescan paths (cf. bug #15378)+-- use box and && rather than point, so that rescan happens when the+-- traverse stack is non-empty++create table spgist_box_tbl(id serial, b box);+insert into spgist_box_tbl(b)+select box(point(i,j),point(i+s,j+s))+ from generate_series(1,100,5) i,+ generate_series(1,100,5) j,+ generate_series(1,10) s;+create index spgist_box_idx on spgist_box_tbl using spgist (b);++select count(*)+ from (values (point(5,5)),(point(8,8)),(point(12,12))) v(p)+ where exists(select * from spgist_box_tbl b where b.b && box(v.p,v.p));
-- The point opclass's choose method only uses the spgMatchNode action,
-- so the other actions are not tested by the above. Create an index using
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients from your mail client; the link fills in
the headers below: reply via email
Some clients, webmail especially, drop In-Reply-To and References from
a link, and the reply then starts a new thread: use the mbox below.
To: pgsql-bugs@postgresql.org
Cc: andrew@tao11.riddles.org.uk, a.korotkov@postgrespro.ru, teodor@sigaev.ru
Subject: Re: BUG #15378: SP-GIST memory context screwup?
In-Reply-To: <87tvmwov48.fsf@news-spur.riddles.org.uk>
References: <153663176628.23136.11901365223750051490@wrigleys.postgresql.org> <87bm94rba5.fsf@news-spur.riddles.org.uk> <CAPpHfdvbVMjB7ORQeXRxMX65u7P-TfG66bZh5U7+3j2QTAov-A@mail.gmail.com> <87y3c8oy1g.fsf@news-spur.riddles.org.uk> <87tvmwov48.fsf@news-spur.riddles.org.uk>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox