On Tue, Dec 9, 2014 at 6:43 PM, Michael Paquier <michael.paqu...@gmail.com> wrote: > OK. Perhaps that's not worth mentioning in the release notes, but some > users may be used to the old behavior. What about the other issues > (regression test for permissions incorrect and matviews)? Here is in any case an updated patch to fix all those things rebased on latest HEAD (ae4e688). Thanks, -- Michael
From 4cc862ed78b3537438e257aa24a5d0ee1479eb24 Mon Sep 17 00:00:00 2001 From: Michael Paquier <michael@otacoo.com> Date: Tue, 9 Dec 2014 16:40:39 +0900 Subject: [PATCH] Fix two bugs in REINDEX SCHEMA: regression and matviews
The following issues are fixed: - The key scan used was using a filter on relation relkind, but that's not actually necessary as a filter is applied when building the list of OIDs reindexed. - Regression test checking permission of reindexed schema was broken --- src/backend/commands/indexcmds.c | 8 ++------ src/test/regress/expected/create_index.out | 15 +++++++-------- src/test/regress/sql/create_index.sql | 8 ++++---- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index cf4de72..6711a66 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -1867,16 +1867,12 @@ ReindexObject(const char *objectName, ReindexObjectType objectKind) */ if (objectKind == REINDEX_OBJECT_SCHEMA) { - scan_keys = palloc(sizeof(ScanKeyData) * 2); + scan_keys = palloc(sizeof(ScanKeyData)); ScanKeyInit(&scan_keys[0], Anum_pg_class_relnamespace, BTEqualStrategyNumber, F_OIDEQ, ObjectIdGetDatum(objectOid)); - ScanKeyInit(&scan_keys[1], - Anum_pg_class_relkind, - BTEqualStrategyNumber, F_CHAREQ, - 'r'); - num_keys = 2; + num_keys = 1; } else num_keys = 0; diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out index eba14e2..0d0a5ca 100644 --- a/src/test/regress/expected/create_index.out +++ b/src/test/regress/expected/create_index.out @@ -2837,24 +2837,23 @@ explain (costs off) REINDEX SCHEMA schema_to_reindex; -- failure, schema does not exist ERROR: schema "schema_to_reindex" does not exist CREATE SCHEMA schema_to_reindex; -CREATE TABLE schema_to_reindex.table1(col1 SERIAL PRIMARY KEY); -CREATE TABLE schema_to_reindex.table2(col1 SERIAL PRIMARY KEY, col2 VARCHAR(100) NOT NULL); -CREATE INDEX ON schema_to_reindex.table2(col2); +CREATE TABLE schema_to_reindex.table(col1 SERIAL PRIMARY KEY); +CREATE MATERIALIZED VIEW schema_to_reindex.matview AS SELECT col1 FROM schema_to_reindex.table; +CREATE INDEX ON schema_to_reindex.matview(col1); REINDEX SCHEMA schema_to_reindex; BEGIN; REINDEX SCHEMA schema_to_reindex; -- failure, cannot run in a transaction ERROR: REINDEX SCHEMA cannot run inside a transaction block END; -- Failure for unauthorized user -CREATE ROLE reindexuser login; +CREATE ROLE user_reindex login; SET SESSION ROLE user_reindex; -ERROR: role "user_reindex" does not exist REINDEX SCHEMA schema_to_reindex; +ERROR: must be owner of schema schema_to_reindex -- Clean up RESET ROLE; DROP ROLE user_reindex; -ERROR: role "user_reindex" does not exist DROP SCHEMA schema_to_reindex CASCADE; NOTICE: drop cascades to 2 other objects -DETAIL: drop cascades to table schema_to_reindex.table1 -drop cascades to table schema_to_reindex.table2 +DETAIL: drop cascades to table schema_to_reindex."table" +drop cascades to materialized view schema_to_reindex.matview diff --git a/src/test/regress/sql/create_index.sql b/src/test/regress/sql/create_index.sql index 1cd57da..5b6c9e6 100644 --- a/src/test/regress/sql/create_index.sql +++ b/src/test/regress/sql/create_index.sql @@ -970,16 +970,16 @@ explain (costs off) -- REINDEX SCHEMA schema_to_reindex; -- failure, schema does not exist CREATE SCHEMA schema_to_reindex; -CREATE TABLE schema_to_reindex.table1(col1 SERIAL PRIMARY KEY); -CREATE TABLE schema_to_reindex.table2(col1 SERIAL PRIMARY KEY, col2 VARCHAR(100) NOT NULL); -CREATE INDEX ON schema_to_reindex.table2(col2); +CREATE TABLE schema_to_reindex.table(col1 SERIAL PRIMARY KEY); +CREATE MATERIALIZED VIEW schema_to_reindex.matview AS SELECT col1 FROM schema_to_reindex.table; +CREATE INDEX ON schema_to_reindex.matview(col1); REINDEX SCHEMA schema_to_reindex; BEGIN; REINDEX SCHEMA schema_to_reindex; -- failure, cannot run in a transaction END; -- Failure for unauthorized user -CREATE ROLE reindexuser login; +CREATE ROLE user_reindex login; SET SESSION ROLE user_reindex; REINDEX SCHEMA schema_to_reindex; -- 2.2.0
-- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers