diff options
| author | Tomas Vondra <tomas.vondra@postgresql.org> | 2023-11-27 16:52:59 +0100 |
|---|---|---|
| committer | Tomas Vondra <tomas.vondra@postgresql.org> | 2023-11-27 16:53:06 +0100 |
| commit | a82ee7ef3aacc2073d3ef5f4b7e5067fa08ea76c (patch) | |
| tree | 5f31814440cafd3c633f0e8cd89fb54a5fc50cf0 | |
| parent | 1f395354d8742d57c166104874114b6e0d01e104 (diff) | |
| download | postgresql-a82ee7ef3aacc2073d3ef5f4b7e5067fa08ea76c.tar.gz postgresql-a82ee7ef3aacc2073d3ef5f4b7e5067fa08ea76c.zip | |
Check if ii_AmCache is NULL in aminsertcleanup
Fix a bug introduced by c1ec02be1d79. It may happen that the executor
opens indexes on the result relation, but no rows end up being inserted.
Then the index_insert_cleanup still gets executed, but passes down NULL
to the AM callback. The AM callback may not expect this, as is the case
of brininsertcleanup, leading to a crash.
Fixed by only calling the cleanup callback if (ii_AmCache != NULL). This
way the AM can simply assume to only see a valid cache.
Reported-by: Richard Guo
Discussion: https://postgr.es/m/CAMbWs4-w9qC-o9hQox9UHvdVZAYTp8OrPQOKtwbvzWaRejTT=Q@mail.gmail.com
| -rw-r--r-- | src/backend/access/index/indexam.c | 2 | ||||
| -rw-r--r-- | src/test/regress/expected/brin.out | 6 | ||||
| -rw-r--r-- | src/test/regress/sql/brin.sql | 7 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c index 597b763d1f6..f23e0199f08 100644 --- a/src/backend/access/index/indexam.c +++ b/src/backend/access/index/indexam.c @@ -207,7 +207,7 @@ index_insert_cleanup(Relation indexRelation, RELATION_CHECKS; Assert(indexInfo); - if (indexRelation->rd_indam->aminsertcleanup) + if (indexRelation->rd_indam->aminsertcleanup && indexInfo->ii_AmCache) indexRelation->rd_indam->aminsertcleanup(indexInfo); } diff --git a/src/test/regress/expected/brin.out b/src/test/regress/expected/brin.out index f0b7de5bf76..2662bb6ed43 100644 --- a/src/test/regress/expected/brin.out +++ b/src/test/regress/expected/brin.out @@ -572,3 +572,9 @@ CREATE UNLOGGED TABLE brintest_unlogged (n numrange); CREATE INDEX brinidx_unlogged ON brintest_unlogged USING brin (n); INSERT INTO brintest_unlogged VALUES (numrange(0, 2^1000::numeric)); DROP TABLE brintest_unlogged; +-- test that the insert optimization works if no rows end up inserted +CREATE TABLE brin_insert_optimization (a int); +INSERT INTO brin_insert_optimization VALUES (1); +CREATE INDEX ON brin_insert_optimization USING brin (a); +UPDATE brin_insert_optimization SET a = a; +DROP TABLE brin_insert_optimization; diff --git a/src/test/regress/sql/brin.sql b/src/test/regress/sql/brin.sql index 929a087a25d..0d3beabb3d7 100644 --- a/src/test/regress/sql/brin.sql +++ b/src/test/regress/sql/brin.sql @@ -515,3 +515,10 @@ CREATE UNLOGGED TABLE brintest_unlogged (n numrange); CREATE INDEX brinidx_unlogged ON brintest_unlogged USING brin (n); INSERT INTO brintest_unlogged VALUES (numrange(0, 2^1000::numeric)); DROP TABLE brintest_unlogged; + +-- test that the insert optimization works if no rows end up inserted +CREATE TABLE brin_insert_optimization (a int); +INSERT INTO brin_insert_optimization VALUES (1); +CREATE INDEX ON brin_insert_optimization USING brin (a); +UPDATE brin_insert_optimization SET a = a; +DROP TABLE brin_insert_optimization; |