Add relkind checks to certain contrib modules
The contrib extensions pageinspect, pg_visibility and pgstattuple only work against regular relations which have storage. They don't work against foreign tables, partitioned (parent) tables, views, et al. Add checks to the user-callable functions to return a useful error message to the user if they mistakenly pass an invalid relation to a function which doesn't accept that kind of relation. In passing, improve some of the existing checks to use ereport() instead of elog(), add a function to consolidate common checks where appropriate, and add some regression tests. Author: Amit Langote, with various changes by me Reviewed by: Michael Paquier and Corey Huinker Discussion: https://postgr.es/m/ab91fd9d-4751-ee77-c87b-4dd704c1e59c@lab.ntt.co.jp
This commit is contained in:
Stephen Frost
parent
b54aad8e34
commit
c08d82f38e
|
|
@ -71,3 +71,12 @@ SELECT * FROM fsm_page_contents(get_raw_page('test1', 'fsm', 0));
|
|||
(1 row)
|
||||
|
||||
DROP TABLE test1;
|
||||
-- check that using any of these functions with a partitioned table would fail
|
||||
create table test_partitioned (a int) partition by range (a);
|
||||
select get_raw_page('test_partitioned', 0); -- error about partitioned table
|
||||
ERROR: cannot get raw page from partitioned table "test_partitioned"
|
||||
-- a regular table which is a member of a partition set should work though
|
||||
create table test_part1 partition of test_partitioned for values from ( 1 ) to (100);
|
||||
select get_raw_page('test_part1', 0); -- get farther and error about empty table
|
||||
ERROR: block number 0 is out of range for relation "test_part1"
|
||||
drop table test_partitioned;
|
||||
|
|
|
|||
|
|
@ -123,6 +123,11 @@ get_raw_page_internal(text *relname, ForkNumber forknum, BlockNumber blkno)
|
|||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||
errmsg("cannot get raw page from foreign table \"%s\"",
|
||||
RelationGetRelationName(rel))));
|
||||
if (rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||
errmsg("cannot get raw page from partitioned table \"%s\"",
|
||||
RelationGetRelationName(rel))));
|
||||
|
||||
/*
|
||||
* Reject attempts to read non-local temporary relations; we would be
|
||||
|
|
|
|||
|
|
@ -28,3 +28,12 @@ SELECT tuple_data_split('test1'::regclass, t_data, t_infomask, t_infomask2, t_bi
|
|||
SELECT * FROM fsm_page_contents(get_raw_page('test1', 'fsm', 0));
|
||||
|
||||
DROP TABLE test1;
|
||||
|
||||
-- check that using any of these functions with a partitioned table would fail
|
||||
create table test_partitioned (a int) partition by range (a);
|
||||
select get_raw_page('test_partitioned', 0); -- error about partitioned table
|
||||
|
||||
-- a regular table which is a member of a partition set should work though
|
||||
create table test_part1 partition of test_partitioned for values from ( 1 ) to (100);
|
||||
select get_raw_page('test_part1', 0); -- get farther and error about empty table
|
||||
drop table test_partitioned;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
# Generated subdirectories
|
||||
/log/
|
||||
/results/
|
||||
/tmp_check/
|
||||
|
|
@ -7,6 +7,8 @@ EXTENSION = pg_visibility
|
|||
DATA = pg_visibility--1.1.sql pg_visibility--1.0--1.1.sql
|
||||
PGFILEDESC = "pg_visibility - page visibility information"
|
||||
|
||||
REGRESS = pg_visibility
|
||||
|
||||
ifdef USE_PGXS
|
||||
PG_CONFIG = pg_config
|
||||
PGXS := $(shell $(PG_CONFIG) --pgxs)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,142 @@
|
|||
CREATE EXTENSION pg_visibility;
|
||||
--
|
||||
-- check that using the module's functions with unsupported relations will fail
|
||||
--
|
||||
-- partitioned tables (the parent ones) don't have visibility maps
|
||||
create table test_partitioned (a int) partition by list (a);
|
||||
-- these should all fail
|
||||
select pg_visibility('test_partitioned', 0);
|
||||
ERROR: "test_partitioned" is not a table, materialized view, or TOAST table
|
||||
select pg_visibility_map('test_partitioned');
|
||||
ERROR: "test_partitioned" is not a table, materialized view, or TOAST table
|
||||
select pg_visibility_map_summary('test_partitioned');
|
||||
ERROR: "test_partitioned" is not a table, materialized view, or TOAST table
|
||||
select pg_check_frozen('test_partitioned');
|
||||
ERROR: "test_partitioned" is not a table, materialized view, or TOAST table
|
||||
select pg_truncate_visibility_map('test_partitioned');
|
||||
ERROR: "test_partitioned" is not a table, materialized view, or TOAST table
|
||||
create table test_partition partition of test_partitioned for values in (1);
|
||||
create index test_index on test_partition (a);
|
||||
-- indexes do not, so these all fail
|
||||
select pg_visibility('test_index', 0);
|
||||
ERROR: "test_index" is not a table, materialized view, or TOAST table
|
||||
select pg_visibility_map('test_index');
|
||||
ERROR: "test_index" is not a table, materialized view, or TOAST table
|
||||
select pg_visibility_map_summary('test_index');
|
||||
ERROR: "test_index" is not a table, materialized view, or TOAST table
|
||||
select pg_check_frozen('test_index');
|
||||
ERROR: "test_index" is not a table, materialized view, or TOAST table
|
||||
select pg_truncate_visibility_map('test_index');
|
||||
ERROR: "test_index" is not a table, materialized view, or TOAST table
|
||||
create view test_view as select 1;
|
||||
-- views do not have VMs, so these all fail
|
||||
select pg_visibility('test_view', 0);
|
||||
ERROR: "test_view" is not a table, materialized view, or TOAST table
|
||||
select pg_visibility_map('test_view');
|
||||
ERROR: "test_view" is not a table, materialized view, or TOAST table
|
||||
select pg_visibility_map_summary('test_view');
|
||||
ERROR: "test_view" is not a table, materialized view, or TOAST table
|
||||
select pg_check_frozen('test_view');
|
||||
ERROR: "test_view" is not a table, materialized view, or TOAST table
|
||||
select pg_truncate_visibility_map('test_view');
|
||||
ERROR: "test_view" is not a table, materialized view, or TOAST table
|
||||
create sequence test_sequence;
|
||||
-- sequences do not have VMs, so these all fail
|
||||
select pg_visibility('test_sequence', 0);
|
||||
ERROR: "test_sequence" is not a table, materialized view, or TOAST table
|
||||
select pg_visibility_map('test_sequence');
|
||||
ERROR: "test_sequence" is not a table, materialized view, or TOAST table
|
||||
select pg_visibility_map_summary('test_sequence');
|
||||
ERROR: "test_sequence" is not a table, materialized view, or TOAST table
|
||||
select pg_check_frozen('test_sequence');
|
||||
ERROR: "test_sequence" is not a table, materialized view, or TOAST table
|
||||
select pg_truncate_visibility_map('test_sequence');
|
||||
ERROR: "test_sequence" is not a table, materialized view, or TOAST table
|
||||
create foreign data wrapper dummy;
|
||||
create server dummy_server foreign data wrapper dummy;
|
||||
create foreign table test_foreign_table () server dummy_server;
|
||||
-- foreign tables do not have VMs, so these all fail
|
||||
select pg_visibility('test_foreign_table', 0);
|
||||
ERROR: "test_foreign_table" is not a table, materialized view, or TOAST table
|
||||
select pg_visibility_map('test_foreign_table');
|
||||
ERROR: "test_foreign_table" is not a table, materialized view, or TOAST table
|
||||
select pg_visibility_map_summary('test_foreign_table');
|
||||
ERROR: "test_foreign_table" is not a table, materialized view, or TOAST table
|
||||
select pg_check_frozen('test_foreign_table');
|
||||
ERROR: "test_foreign_table" is not a table, materialized view, or TOAST table
|
||||
select pg_truncate_visibility_map('test_foreign_table');
|
||||
ERROR: "test_foreign_table" is not a table, materialized view, or TOAST table
|
||||
-- check some of the allowed relkinds
|
||||
create table regular_table (a int);
|
||||
insert into regular_table values (1), (2);
|
||||
vacuum regular_table;
|
||||
select count(*) > 0 from pg_visibility('regular_table');
|
||||
?column?
|
||||
----------
|
||||
t
|
||||
(1 row)
|
||||
|
||||
truncate regular_table;
|
||||
select count(*) > 0 from pg_visibility('regular_table');
|
||||
?column?
|
||||
----------
|
||||
f
|
||||
(1 row)
|
||||
|
||||
create materialized view matview_visibility_test as select * from regular_table;
|
||||
vacuum matview_visibility_test;
|
||||
select count(*) > 0 from pg_visibility('matview_visibility_test');
|
||||
?column?
|
||||
----------
|
||||
f
|
||||
(1 row)
|
||||
|
||||
insert into regular_table values (1), (2);
|
||||
refresh materialized view matview_visibility_test;
|
||||
select count(*) > 0 from pg_visibility('matview_visibility_test');
|
||||
?column?
|
||||
----------
|
||||
t
|
||||
(1 row)
|
||||
|
||||
-- regular tables which are part of a partition *do* have visibility maps
|
||||
insert into test_partition values (1);
|
||||
vacuum test_partition;
|
||||
select count(*) > 0 from pg_visibility('test_partition', 0);
|
||||
?column?
|
||||
----------
|
||||
t
|
||||
(1 row)
|
||||
|
||||
select count(*) > 0 from pg_visibility_map('test_partition');
|
||||
?column?
|
||||
----------
|
||||
t
|
||||
(1 row)
|
||||
|
||||
select count(*) > 0 from pg_visibility_map_summary('test_partition');
|
||||
?column?
|
||||
----------
|
||||
t
|
||||
(1 row)
|
||||
|
||||
select * from pg_check_frozen('test_partition'); -- hopefully none
|
||||
t_ctid
|
||||
--------
|
||||
(0 rows)
|
||||
|
||||
select pg_truncate_visibility_map('test_partition');
|
||||
pg_truncate_visibility_map
|
||||
----------------------------
|
||||
|
||||
(1 row)
|
||||
|
||||
-- cleanup
|
||||
drop table test_partitioned;
|
||||
drop view test_view;
|
||||
drop sequence test_sequence;
|
||||
drop foreign table test_foreign_table;
|
||||
drop server dummy_server;
|
||||
drop foreign data wrapper dummy;
|
||||
drop materialized view matview_visibility_test;
|
||||
drop table regular_table;
|
||||
|
|
@ -53,6 +53,7 @@ static corrupt_items *collect_corrupt_items(Oid relid, bool all_visible,
|
|||
static void record_corrupt_item(corrupt_items *items, ItemPointer tid);
|
||||
static bool tuple_all_visible(HeapTuple tup, TransactionId OldestXmin,
|
||||
Buffer buffer);
|
||||
static void check_relation_relkind(Relation rel);
|
||||
|
||||
/*
|
||||
* Visibility map information for a single block of a relation.
|
||||
|
|
@ -75,6 +76,9 @@ pg_visibility_map(PG_FUNCTION_ARGS)
|
|||
|
||||
rel = relation_open(relid, AccessShareLock);
|
||||
|
||||
/* Only some relkinds have a visibility map */
|
||||
check_relation_relkind(rel);
|
||||
|
||||
if (blkno < 0 || blkno > MaxBlockNumber)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||
|
|
@ -114,6 +118,9 @@ pg_visibility(PG_FUNCTION_ARGS)
|
|||
|
||||
rel = relation_open(relid, AccessShareLock);
|
||||
|
||||
/* Only some relkinds have a visibility map */
|
||||
check_relation_relkind(rel);
|
||||
|
||||
if (blkno < 0 || blkno > MaxBlockNumber)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||
|
|
@ -167,6 +174,7 @@ pg_visibility_map_rel(PG_FUNCTION_ARGS)
|
|||
funcctx = SRF_FIRSTCALL_INIT();
|
||||
oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
|
||||
funcctx->tuple_desc = pg_visibility_tupdesc(true, false);
|
||||
/* collect_visibility_data will verify the relkind */
|
||||
funcctx->user_fctx = collect_visibility_data(relid, false);
|
||||
MemoryContextSwitchTo(oldcontext);
|
||||
}
|
||||
|
|
@ -211,6 +219,7 @@ pg_visibility_rel(PG_FUNCTION_ARGS)
|
|||
funcctx = SRF_FIRSTCALL_INIT();
|
||||
oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
|
||||
funcctx->tuple_desc = pg_visibility_tupdesc(true, true);
|
||||
/* collect_visibility_data will verify the relkind */
|
||||
funcctx->user_fctx = collect_visibility_data(relid, true);
|
||||
MemoryContextSwitchTo(oldcontext);
|
||||
}
|
||||
|
|
@ -257,6 +266,10 @@ pg_visibility_map_summary(PG_FUNCTION_ARGS)
|
|||
bool nulls[2];
|
||||
|
||||
rel = relation_open(relid, AccessShareLock);
|
||||
|
||||
/* Only some relkinds have a visibility map */
|
||||
check_relation_relkind(rel);
|
||||
|
||||
nblocks = RelationGetNumberOfBlocks(rel);
|
||||
|
||||
for (blkno = 0; blkno < nblocks; ++blkno)
|
||||
|
|
@ -309,6 +322,7 @@ pg_check_frozen(PG_FUNCTION_ARGS)
|
|||
|
||||
funcctx = SRF_FIRSTCALL_INIT();
|
||||
oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
|
||||
/* collect_corrupt_items will verify the relkind */
|
||||
funcctx->user_fctx = collect_corrupt_items(relid, false, true);
|
||||
MemoryContextSwitchTo(oldcontext);
|
||||
}
|
||||
|
|
@ -340,6 +354,7 @@ pg_check_visible(PG_FUNCTION_ARGS)
|
|||
|
||||
funcctx = SRF_FIRSTCALL_INIT();
|
||||
oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
|
||||
/* collect_corrupt_items will verify the relkind */
|
||||
funcctx->user_fctx = collect_corrupt_items(relid, true, false);
|
||||
MemoryContextSwitchTo(oldcontext);
|
||||
}
|
||||
|
|
@ -369,13 +384,8 @@ pg_truncate_visibility_map(PG_FUNCTION_ARGS)
|
|||
|
||||
rel = relation_open(relid, AccessExclusiveLock);
|
||||
|
||||
if (rel->rd_rel->relkind != RELKIND_RELATION &&
|
||||
rel->rd_rel->relkind != RELKIND_MATVIEW &&
|
||||
rel->rd_rel->relkind != RELKIND_TOASTVALUE)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||
errmsg("\"%s\" is not a table, materialized view, or TOAST table",
|
||||
RelationGetRelationName(rel))));
|
||||
/* Only some relkinds have a visibility map */
|
||||
check_relation_relkind(rel);
|
||||
|
||||
RelationOpenSmgr(rel);
|
||||
rel->rd_smgr->smgr_vm_nblocks = InvalidBlockNumber;
|
||||
|
|
@ -451,6 +461,9 @@ pg_visibility_tupdesc(bool include_blkno, bool include_pd)
|
|||
|
||||
/*
|
||||
* Collect visibility data about a relation.
|
||||
*
|
||||
* Checks relkind of relid and will throw an error if the relation does not
|
||||
* have a VM.
|
||||
*/
|
||||
static vbits *
|
||||
collect_visibility_data(Oid relid, bool include_pd)
|
||||
|
|
@ -464,6 +477,9 @@ collect_visibility_data(Oid relid, bool include_pd)
|
|||
|
||||
rel = relation_open(relid, AccessShareLock);
|
||||
|
||||
/* Only some relkinds have a visibility map */
|
||||
check_relation_relkind(rel);
|
||||
|
||||
nblocks = RelationGetNumberOfBlocks(rel);
|
||||
info = palloc0(offsetof(vbits, bits) +nblocks);
|
||||
info->next = 0;
|
||||
|
|
@ -523,6 +539,9 @@ collect_visibility_data(Oid relid, bool include_pd)
|
|||
*
|
||||
* If all_frozen is passed as true, this will include all items which are
|
||||
* on pages marked as all-frozen but which do not seem to in fact be frozen.
|
||||
*
|
||||
* Checks relkind of relid and will throw an error if the relation does not
|
||||
* have a VM.
|
||||
*/
|
||||
static corrupt_items *
|
||||
collect_corrupt_items(Oid relid, bool all_visible, bool all_frozen)
|
||||
|
|
@ -543,13 +562,8 @@ collect_corrupt_items(Oid relid, bool all_visible, bool all_frozen)
|
|||
|
||||
rel = relation_open(relid, AccessShareLock);
|
||||
|
||||
if (rel->rd_rel->relkind != RELKIND_RELATION &&
|
||||
rel->rd_rel->relkind != RELKIND_MATVIEW &&
|
||||
rel->rd_rel->relkind != RELKIND_TOASTVALUE)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||
errmsg("\"%s\" is not a table, materialized view, or TOAST table",
|
||||
RelationGetRelationName(rel))));
|
||||
/* Only some relkinds have a visibility map */
|
||||
check_relation_relkind(rel);
|
||||
|
||||
nblocks = RelationGetNumberOfBlocks(rel);
|
||||
|
||||
|
|
@ -747,3 +761,19 @@ tuple_all_visible(HeapTuple tup, TransactionId OldestXmin, Buffer buffer)
|
|||
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
* check_relation_relkind - convenience routine to check that relation
|
||||
* is of the relkind supported by the callers
|
||||
*/
|
||||
static void
|
||||
check_relation_relkind(Relation rel)
|
||||
{
|
||||
if (rel->rd_rel->relkind != RELKIND_RELATION &&
|
||||
rel->rd_rel->relkind != RELKIND_MATVIEW &&
|
||||
rel->rd_rel->relkind != RELKIND_TOASTVALUE)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||
errmsg("\"%s\" is not a table, materialized view, or TOAST table",
|
||||
RelationGetRelationName(rel))));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,83 @@
|
|||
CREATE EXTENSION pg_visibility;
|
||||
|
||||
--
|
||||
-- check that using the module's functions with unsupported relations will fail
|
||||
--
|
||||
|
||||
-- partitioned tables (the parent ones) don't have visibility maps
|
||||
create table test_partitioned (a int) partition by list (a);
|
||||
-- these should all fail
|
||||
select pg_visibility('test_partitioned', 0);
|
||||
select pg_visibility_map('test_partitioned');
|
||||
select pg_visibility_map_summary('test_partitioned');
|
||||
select pg_check_frozen('test_partitioned');
|
||||
select pg_truncate_visibility_map('test_partitioned');
|
||||
|
||||
create table test_partition partition of test_partitioned for values in (1);
|
||||
create index test_index on test_partition (a);
|
||||
-- indexes do not, so these all fail
|
||||
select pg_visibility('test_index', 0);
|
||||
select pg_visibility_map('test_index');
|
||||
select pg_visibility_map_summary('test_index');
|
||||
select pg_check_frozen('test_index');
|
||||
select pg_truncate_visibility_map('test_index');
|
||||
|
||||
create view test_view as select 1;
|
||||
-- views do not have VMs, so these all fail
|
||||
select pg_visibility('test_view', 0);
|
||||
select pg_visibility_map('test_view');
|
||||
select pg_visibility_map_summary('test_view');
|
||||
select pg_check_frozen('test_view');
|
||||
select pg_truncate_visibility_map('test_view');
|
||||
|
||||
create sequence test_sequence;
|
||||
-- sequences do not have VMs, so these all fail
|
||||
select pg_visibility('test_sequence', 0);
|
||||
select pg_visibility_map('test_sequence');
|
||||
select pg_visibility_map_summary('test_sequence');
|
||||
select pg_check_frozen('test_sequence');
|
||||
select pg_truncate_visibility_map('test_sequence');
|
||||
|
||||
create foreign data wrapper dummy;
|
||||
create server dummy_server foreign data wrapper dummy;
|
||||
create foreign table test_foreign_table () server dummy_server;
|
||||
-- foreign tables do not have VMs, so these all fail
|
||||
select pg_visibility('test_foreign_table', 0);
|
||||
select pg_visibility_map('test_foreign_table');
|
||||
select pg_visibility_map_summary('test_foreign_table');
|
||||
select pg_check_frozen('test_foreign_table');
|
||||
select pg_truncate_visibility_map('test_foreign_table');
|
||||
|
||||
-- check some of the allowed relkinds
|
||||
create table regular_table (a int);
|
||||
insert into regular_table values (1), (2);
|
||||
vacuum regular_table;
|
||||
select count(*) > 0 from pg_visibility('regular_table');
|
||||
truncate regular_table;
|
||||
select count(*) > 0 from pg_visibility('regular_table');
|
||||
|
||||
create materialized view matview_visibility_test as select * from regular_table;
|
||||
vacuum matview_visibility_test;
|
||||
select count(*) > 0 from pg_visibility('matview_visibility_test');
|
||||
insert into regular_table values (1), (2);
|
||||
refresh materialized view matview_visibility_test;
|
||||
select count(*) > 0 from pg_visibility('matview_visibility_test');
|
||||
|
||||
-- regular tables which are part of a partition *do* have visibility maps
|
||||
insert into test_partition values (1);
|
||||
vacuum test_partition;
|
||||
select count(*) > 0 from pg_visibility('test_partition', 0);
|
||||
select count(*) > 0 from pg_visibility_map('test_partition');
|
||||
select count(*) > 0 from pg_visibility_map_summary('test_partition');
|
||||
select * from pg_check_frozen('test_partition'); -- hopefully none
|
||||
select pg_truncate_visibility_map('test_partition');
|
||||
|
||||
-- cleanup
|
||||
drop table test_partitioned;
|
||||
drop view test_view;
|
||||
drop sequence test_sequence;
|
||||
drop foreign table test_foreign_table;
|
||||
drop server dummy_server;
|
||||
drop foreign data wrapper dummy;
|
||||
drop materialized view matview_visibility_test;
|
||||
drop table regular_table;
|
||||
|
|
@ -138,3 +138,110 @@ select * from pgstathashindex('test_hashidx');
|
|||
2 | 4 | 0 | 1 | 0 | 0 | 0 | 100
|
||||
(1 row)
|
||||
|
||||
-- these should error with the wrong type
|
||||
select pgstatginindex('test_pkey');
|
||||
ERROR: relation "test_pkey" is not a GIN index
|
||||
select pgstathashindex('test_pkey');
|
||||
ERROR: relation "test_pkey" is not a HASH index
|
||||
select pgstatindex('test_ginidx');
|
||||
ERROR: relation "test_ginidx" is not a btree index
|
||||
select pgstathashindex('test_ginidx');
|
||||
ERROR: relation "test_ginidx" is not a HASH index
|
||||
select pgstatindex('test_hashidx');
|
||||
ERROR: relation "test_hashidx" is not a btree index
|
||||
select pgstatginindex('test_hashidx');
|
||||
ERROR: relation "test_hashidx" is not a GIN index
|
||||
-- check that using any of these functions with unsupported relations will fail
|
||||
create table test_partitioned (a int) partition by range (a);
|
||||
-- these should all fail
|
||||
select pgstattuple('test_partitioned');
|
||||
ERROR: "test_partitioned" (partitioned table) is not supported
|
||||
select pgstattuple_approx('test_partitioned');
|
||||
ERROR: "test_partitioned" is not a table or materialized view
|
||||
select pg_relpages('test_partitioned');
|
||||
ERROR: "test_partitioned" is not a table, index, materialized view, sequence, or TOAST table
|
||||
select pgstatindex('test_partitioned');
|
||||
ERROR: relation "test_partitioned" is not a btree index
|
||||
select pgstatginindex('test_partitioned');
|
||||
ERROR: relation "test_partitioned" is not a GIN index
|
||||
select pgstathashindex('test_partitioned');
|
||||
ERROR: "test_partitioned" is not an index
|
||||
create view test_view as select 1;
|
||||
-- these should all fail
|
||||
select pgstattuple('test_view');
|
||||
ERROR: "test_view" (view) is not supported
|
||||
select pgstattuple_approx('test_view');
|
||||
ERROR: "test_view" is not a table or materialized view
|
||||
select pg_relpages('test_view');
|
||||
ERROR: "test_view" is not a table, index, materialized view, sequence, or TOAST table
|
||||
select pgstatindex('test_view');
|
||||
ERROR: relation "test_view" is not a btree index
|
||||
select pgstatginindex('test_view');
|
||||
ERROR: relation "test_view" is not a GIN index
|
||||
select pgstathashindex('test_view');
|
||||
ERROR: "test_view" is not an index
|
||||
create foreign data wrapper dummy;
|
||||
create server dummy_server foreign data wrapper dummy;
|
||||
create foreign table test_foreign_table () server dummy_server;
|
||||
-- these should all fail
|
||||
select pgstattuple('test_foreign_table');
|
||||
ERROR: "test_foreign_table" (foreign table) is not supported
|
||||
select pgstattuple_approx('test_foreign_table');
|
||||
ERROR: "test_foreign_table" is not a table or materialized view
|
||||
select pg_relpages('test_foreign_table');
|
||||
ERROR: "test_foreign_table" is not a table, index, materialized view, sequence, or TOAST table
|
||||
select pgstatindex('test_foreign_table');
|
||||
ERROR: relation "test_foreign_table" is not a btree index
|
||||
select pgstatginindex('test_foreign_table');
|
||||
ERROR: relation "test_foreign_table" is not a GIN index
|
||||
select pgstathashindex('test_foreign_table');
|
||||
ERROR: "test_foreign_table" is not an index
|
||||
-- a partition of a partitioned table should work though
|
||||
create table test_partition partition of test_partitioned for values from (1) to (100);
|
||||
select pgstattuple('test_partition');
|
||||
pgstattuple
|
||||
---------------------
|
||||
(0,0,0,0,0,0,0,0,0)
|
||||
(1 row)
|
||||
|
||||
select pgstattuple_approx('test_partition');
|
||||
pgstattuple_approx
|
||||
-----------------------
|
||||
(0,0,0,0,0,0,0,0,0,0)
|
||||
(1 row)
|
||||
|
||||
select pg_relpages('test_partition');
|
||||
pg_relpages
|
||||
-------------
|
||||
0
|
||||
(1 row)
|
||||
|
||||
-- not for the index calls though, of course
|
||||
select pgstatindex('test_partition');
|
||||
ERROR: relation "test_partition" is not a btree index
|
||||
select pgstatginindex('test_partition');
|
||||
ERROR: relation "test_partition" is not a GIN index
|
||||
select pgstathashindex('test_partition');
|
||||
ERROR: "test_partition" is not an index
|
||||
-- an actual index of a partitiond table should work though
|
||||
create index test_partition_idx on test_partition(a);
|
||||
create index test_partition_hash_idx on test_partition using hash (a);
|
||||
WARNING: hash indexes are not WAL-logged and their use is discouraged
|
||||
-- these should work
|
||||
select pgstatindex('test_partition_idx');
|
||||
pgstatindex
|
||||
------------------------------
|
||||
(2,0,8192,0,0,0,0,0,NaN,NaN)
|
||||
(1 row)
|
||||
|
||||
select pgstathashindex('test_partition_hash_idx');
|
||||
pgstathashindex
|
||||
---------------------
|
||||
(2,8,0,1,0,0,0,100)
|
||||
(1 row)
|
||||
|
||||
drop table test_partitioned;
|
||||
drop view test_view;
|
||||
drop foreign table test_foreign_table;
|
||||
drop server dummy_server;
|
||||
drop foreign data wrapper dummy;
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ typedef struct HashIndexStat
|
|||
|
||||
static Datum pgstatindex_impl(Relation rel, FunctionCallInfo fcinfo);
|
||||
static void GetHashPageStats(Page page, HashIndexStat *stats);
|
||||
|
||||
static void check_relation_relkind(Relation rel);
|
||||
|
||||
/* ------------------------------------------------------
|
||||
* pgstatindex()
|
||||
|
|
@ -221,8 +221,10 @@ pgstatindex_impl(Relation rel, FunctionCallInfo fcinfo)
|
|||
BufferAccessStrategy bstrategy = GetAccessStrategy(BAS_BULKREAD);
|
||||
|
||||
if (!IS_INDEX(rel) || !IS_BTREE(rel))
|
||||
elog(ERROR, "relation \"%s\" is not a btree index",
|
||||
RelationGetRelationName(rel));
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||
errmsg("relation \"%s\" is not a btree index",
|
||||
RelationGetRelationName(rel))));
|
||||
|
||||
/*
|
||||
* Reject attempts to read non-local temporary relations; we would be
|
||||
|
|
@ -388,6 +390,9 @@ pg_relpages(PG_FUNCTION_ARGS)
|
|||
relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
|
||||
rel = relation_openrv(relrv, AccessShareLock);
|
||||
|
||||
/* only some relkinds have storage */
|
||||
check_relation_relkind(rel);
|
||||
|
||||
/* note: this will work OK on non-local temp tables */
|
||||
|
||||
relpages = RelationGetNumberOfBlocks(rel);
|
||||
|
|
@ -409,6 +414,9 @@ pg_relpages_v1_5(PG_FUNCTION_ARGS)
|
|||
relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
|
||||
rel = relation_openrv(relrv, AccessShareLock);
|
||||
|
||||
/* only some relkinds have storage */
|
||||
check_relation_relkind(rel);
|
||||
|
||||
/* note: this will work OK on non-local temp tables */
|
||||
|
||||
relpages = RelationGetNumberOfBlocks(rel);
|
||||
|
|
@ -433,6 +441,9 @@ pg_relpagesbyid(PG_FUNCTION_ARGS)
|
|||
|
||||
rel = relation_open(relid, AccessShareLock);
|
||||
|
||||
/* only some relkinds have storage */
|
||||
check_relation_relkind(rel);
|
||||
|
||||
/* note: this will work OK on non-local temp tables */
|
||||
|
||||
relpages = RelationGetNumberOfBlocks(rel);
|
||||
|
|
@ -452,6 +463,9 @@ pg_relpagesbyid_v1_5(PG_FUNCTION_ARGS)
|
|||
|
||||
rel = relation_open(relid, AccessShareLock);
|
||||
|
||||
/* only some relkinds have storage */
|
||||
check_relation_relkind(rel);
|
||||
|
||||
/* note: this will work OK on non-local temp tables */
|
||||
|
||||
relpages = RelationGetNumberOfBlocks(rel);
|
||||
|
|
@ -508,8 +522,10 @@ pgstatginindex_internal(Oid relid, FunctionCallInfo fcinfo)
|
|||
rel = relation_open(relid, AccessShareLock);
|
||||
|
||||
if (!IS_INDEX(rel) || !IS_GIN(rel))
|
||||
elog(ERROR, "relation \"%s\" is not a GIN index",
|
||||
RelationGetRelationName(rel));
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||
errmsg("relation \"%s\" is not a GIN index",
|
||||
RelationGetRelationName(rel))));
|
||||
|
||||
/*
|
||||
* Reject attempts to read non-local temporary relations; we would be
|
||||
|
|
@ -581,9 +597,13 @@ pgstathashindex(PG_FUNCTION_ARGS)
|
|||
|
||||
rel = index_open(relid, AccessShareLock);
|
||||
|
||||
/* index_open() checks that it's an index */
|
||||
if (!IS_HASH(rel))
|
||||
elog(ERROR, "relation \"%s\" is not a HASH index",
|
||||
RelationGetRelationName(rel));
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||
errmsg("relation \"%s\" is not a HASH index",
|
||||
RelationGetRelationName(rel))));
|
||||
|
||||
|
||||
/*
|
||||
* Reject attempts to read non-local temporary relations; we would be
|
||||
|
|
@ -723,3 +743,21 @@ GetHashPageStats(Page page, HashIndexStat *stats)
|
|||
}
|
||||
stats->free_space += PageGetExactFreeSpace(page);
|
||||
}
|
||||
|
||||
/*
|
||||
* check_relation_relkind - convenience routine to check that relation
|
||||
* is of the relkind supported by the callers
|
||||
*/
|
||||
static void
|
||||
check_relation_relkind(Relation rel)
|
||||
{
|
||||
if (rel->rd_rel->relkind != RELKIND_RELATION &&
|
||||
rel->rd_rel->relkind != RELKIND_INDEX &&
|
||||
rel->rd_rel->relkind != RELKIND_MATVIEW &&
|
||||
rel->rd_rel->relkind != RELKIND_SEQUENCE &&
|
||||
rel->rd_rel->relkind != RELKIND_TOASTVALUE)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||
errmsg("\"%s\" is not a table, index, materialized view, sequence, or TOAST table",
|
||||
RelationGetRelationName(rel))));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -293,6 +293,9 @@ pgstat_relation(Relation rel, FunctionCallInfo fcinfo)
|
|||
case RELKIND_FOREIGN_TABLE:
|
||||
err = "foreign table";
|
||||
break;
|
||||
case RELKIND_PARTITIONED_TABLE:
|
||||
err = "partitioned table";
|
||||
break;
|
||||
default:
|
||||
err = "unknown";
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -51,3 +51,67 @@ select * from pgstatginindex('test_ginidx');
|
|||
create index test_hashidx on test using hash (b);
|
||||
|
||||
select * from pgstathashindex('test_hashidx');
|
||||
|
||||
-- these should error with the wrong type
|
||||
select pgstatginindex('test_pkey');
|
||||
select pgstathashindex('test_pkey');
|
||||
|
||||
select pgstatindex('test_ginidx');
|
||||
select pgstathashindex('test_ginidx');
|
||||
|
||||
select pgstatindex('test_hashidx');
|
||||
select pgstatginindex('test_hashidx');
|
||||
|
||||
-- check that using any of these functions with unsupported relations will fail
|
||||
create table test_partitioned (a int) partition by range (a);
|
||||
-- these should all fail
|
||||
select pgstattuple('test_partitioned');
|
||||
select pgstattuple_approx('test_partitioned');
|
||||
select pg_relpages('test_partitioned');
|
||||
select pgstatindex('test_partitioned');
|
||||
select pgstatginindex('test_partitioned');
|
||||
select pgstathashindex('test_partitioned');
|
||||
|
||||
create view test_view as select 1;
|
||||
-- these should all fail
|
||||
select pgstattuple('test_view');
|
||||
select pgstattuple_approx('test_view');
|
||||
select pg_relpages('test_view');
|
||||
select pgstatindex('test_view');
|
||||
select pgstatginindex('test_view');
|
||||
select pgstathashindex('test_view');
|
||||
|
||||
create foreign data wrapper dummy;
|
||||
create server dummy_server foreign data wrapper dummy;
|
||||
create foreign table test_foreign_table () server dummy_server;
|
||||
-- these should all fail
|
||||
select pgstattuple('test_foreign_table');
|
||||
select pgstattuple_approx('test_foreign_table');
|
||||
select pg_relpages('test_foreign_table');
|
||||
select pgstatindex('test_foreign_table');
|
||||
select pgstatginindex('test_foreign_table');
|
||||
select pgstathashindex('test_foreign_table');
|
||||
|
||||
-- a partition of a partitioned table should work though
|
||||
create table test_partition partition of test_partitioned for values from (1) to (100);
|
||||
select pgstattuple('test_partition');
|
||||
select pgstattuple_approx('test_partition');
|
||||
select pg_relpages('test_partition');
|
||||
|
||||
-- not for the index calls though, of course
|
||||
select pgstatindex('test_partition');
|
||||
select pgstatginindex('test_partition');
|
||||
select pgstathashindex('test_partition');
|
||||
|
||||
-- an actual index of a partitiond table should work though
|
||||
create index test_partition_idx on test_partition(a);
|
||||
create index test_partition_hash_idx on test_partition using hash (a);
|
||||
-- these should work
|
||||
select pgstatindex('test_partition_idx');
|
||||
select pgstathashindex('test_partition_hash_idx');
|
||||
|
||||
drop table test_partitioned;
|
||||
drop view test_view;
|
||||
drop foreign table test_foreign_table;
|
||||
drop server dummy_server;
|
||||
drop foreign data wrapper dummy;
|
||||
|
|
|
|||
Loading…
Reference in New Issue