diff options
| author | Noah Misch <noah@leadboat.com> | 2015-01-07 22:33:58 -0500 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2015-01-07 22:34:30 -0500 |
| commit | 616830052ba3ed8abc52ba215f53d55f8413eae9 (patch) | |
| tree | 676c6b264effd9a4efddae93e61c7cb470aafa2a /src/test | |
| parent | d7b16eea3a0ab48a654fd4b71be707bf0f2acab8 (diff) | |
Reject ANALYZE commands during VACUUM FULL or another ANALYZE.
vacuum()'s static variable handling makes it non-reentrant; an ensuing
null pointer deference crashed the backend. Back-patch to 9.0 (all
supported versions).
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/regress/expected/vacuum.out | 14 | ||||
| -rw-r--r-- | src/test/regress/sql/vacuum.sql | 9 |
2 files changed, 21 insertions, 2 deletions
diff --git a/src/test/regress/expected/vacuum.out b/src/test/regress/expected/vacuum.out index f1b8dd0cacf..3d15606e9bb 100644 --- a/src/test/regress/expected/vacuum.out +++ b/src/test/regress/expected/vacuum.out @@ -61,12 +61,24 @@ VACUUM (ANALYZE, FULL) vactst; CREATE TABLE vaccluster (i INT PRIMARY KEY); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "vaccluster_pkey" for table "vaccluster" ALTER TABLE vaccluster CLUSTER ON vaccluster_pkey; -INSERT INTO vaccluster SELECT * FROM vactst; CLUSTER vaccluster; +CREATE FUNCTION do_analyze() RETURNS VOID VOLATILE LANGUAGE SQL + AS 'ANALYZE pg_am'; +CREATE FUNCTION wrap_do_analyze(c INT) RETURNS INT IMMUTABLE LANGUAGE SQL + AS 'SELECT $1 FROM do_analyze()'; +CREATE INDEX ON vactst(wrap_do_analyze(i)); +INSERT INTO vactst VALUES (1), (2); +ANALYZE vactst; +ERROR: ANALYZE cannot be executed from VACUUM or ANALYZE +CONTEXT: SQL function "do_analyze" statement 1 +SQL function "wrap_do_analyze" statement 1 VACUUM FULL pg_am; VACUUM FULL pg_class; VACUUM FULL pg_database; VACUUM FULL vaccluster; VACUUM FULL vactst; +ERROR: ANALYZE cannot be executed from VACUUM or ANALYZE +CONTEXT: SQL function "do_analyze" statement 1 +SQL function "wrap_do_analyze" statement 1 DROP TABLE vaccluster; DROP TABLE vactst; diff --git a/src/test/regress/sql/vacuum.sql b/src/test/regress/sql/vacuum.sql index 30551ad1f27..4b624fe379e 100644 --- a/src/test/regress/sql/vacuum.sql +++ b/src/test/regress/sql/vacuum.sql @@ -44,9 +44,16 @@ VACUUM (ANALYZE, FULL) vactst; CREATE TABLE vaccluster (i INT PRIMARY KEY); ALTER TABLE vaccluster CLUSTER ON vaccluster_pkey; -INSERT INTO vaccluster SELECT * FROM vactst; CLUSTER vaccluster; +CREATE FUNCTION do_analyze() RETURNS VOID VOLATILE LANGUAGE SQL + AS 'ANALYZE pg_am'; +CREATE FUNCTION wrap_do_analyze(c INT) RETURNS INT IMMUTABLE LANGUAGE SQL + AS 'SELECT $1 FROM do_analyze()'; +CREATE INDEX ON vactst(wrap_do_analyze(i)); +INSERT INTO vactst VALUES (1), (2); +ANALYZE vactst; + VACUUM FULL pg_am; VACUUM FULL pg_class; VACUUM FULL pg_database; |