mirror of
https://github.com/postgres/postgres.git
synced 2025-07-28 23:42:10 +03:00
pageinspect: Fix failure with hash_bitmap_info() for partitioned indexes
This function reads directly a page from a relation, relying on index_open() to open the index to read from. Unfortunately, this would crash when using partitioned indexes, as these can be opened with index_open() but they have no physical pages. Alexander has fixed the module, while I have written the test. Author: Alexander Lakhin, Michael Paquier Discussion: https://postgr.es/m/18246-f4d9ff7cb3af77e6@postgresql.org Backpatch-through: 12
This commit is contained in:
@ -14,6 +14,7 @@
|
||||
|
||||
#include "access/hash.h"
|
||||
#include "access/htup_details.h"
|
||||
#include "access/relation.h"
|
||||
#include "catalog/pg_type.h"
|
||||
#include "catalog/pg_am.h"
|
||||
#include "funcapi.h"
|
||||
@ -27,6 +28,7 @@ PG_FUNCTION_INFO_V1(hash_page_items);
|
||||
PG_FUNCTION_INFO_V1(hash_bitmap_info);
|
||||
PG_FUNCTION_INFO_V1(hash_metapage_info);
|
||||
|
||||
#define IS_INDEX(r) ((r)->rd_rel->relkind == RELKIND_INDEX)
|
||||
#define IS_HASH(r) ((r)->rd_rel->relam == HASH_AM_OID)
|
||||
|
||||
/* ------------------------------------------------
|
||||
@ -420,9 +422,9 @@ hash_bitmap_info(PG_FUNCTION_ARGS)
|
||||
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
|
||||
(errmsg("must be superuser to use raw page functions"))));
|
||||
|
||||
indexRel = index_open(indexRelid, AccessShareLock);
|
||||
indexRel = relation_open(indexRelid, AccessShareLock);
|
||||
|
||||
if (!IS_HASH(indexRel))
|
||||
if (!IS_INDEX(indexRel) || !IS_HASH(indexRel))
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||
errmsg("\"%s\" is not a %s index",
|
||||
|
Reference in New Issue
Block a user