Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcc53123

Browse files
committed
Tweak pg_partition_tree for undefined relations and unsupported relkinds
This fixes a crash which happened when calling the function directlywith a relation OID referring to a non-existing object, and changes thebehavior so as NULL is returned for unsupported relkinds instead ofgenerating an error. This puts the new function in line with many othersystem functions, and eases actions like full scans of pg_class.Author: Michael PaquierReviewed-by: Amit Langote, Stephen FrostDiscussion:https://postgr.es/m/20181207010406.GO2407@paquier.xyz
1 parent7a28e9a commitcc53123

File tree

3 files changed

+23
-7
lines changed

3 files changed

+23
-7
lines changed

‎src/backend/utils/adt/partitionfuncs.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include"funcapi.h"
2424
#include"utils/fmgrprotos.h"
2525
#include"utils/lsyscache.h"
26+
#include"utils/syscache.h"
2627

2728

2829
/*
@@ -42,16 +43,16 @@ pg_partition_tree(PG_FUNCTION_ARGS)
4243
FuncCallContext*funcctx;
4344
ListCell**next;
4445

45-
/* Only allow relation types that can appear in partition trees. */
46+
if (!SearchSysCacheExists1(RELOID,ObjectIdGetDatum(rootrelid)))
47+
PG_RETURN_NULL();
48+
49+
/* Return NULL for relation types that cannot appear in partition trees */
4650
if (relkind!=RELKIND_RELATION&&
4751
relkind!=RELKIND_FOREIGN_TABLE&&
4852
relkind!=RELKIND_INDEX&&
4953
relkind!=RELKIND_PARTITIONED_TABLE&&
5054
relkind!=RELKIND_PARTITIONED_INDEX)
51-
ereport(ERROR,
52-
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
53-
errmsg("\"%s\" is not a table, a foreign table, or an index",
54-
get_rel_name(rootrelid))));
55+
PG_RETURN_NULL();
5556

5657
/* stuff done only on the first call of the function */
5758
if (SRF_IS_FIRSTCALL())

‎src/test/regress/expected/partition_info.out

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ SELECT * FROM pg_partition_tree(NULL);
66
-------+-------------+--------+-------
77
(0 rows)
88

9+
SELECT * FROM pg_partition_tree(0);
10+
relid | parentrelid | isleaf | level
11+
-------+-------------+--------+-------
12+
| | |
13+
(1 row)
14+
915
-- Test table partition trees
1016
CREATE TABLE ptif_test (a int, b int) PARTITION BY range (a);
1117
CREATE TABLE ptif_test0 PARTITION OF ptif_test
@@ -107,8 +113,16 @@ DROP TABLE ptif_normal_table;
107113
CREATE VIEW ptif_test_view AS SELECT 1;
108114
CREATE MATERIALIZED VIEW ptif_test_matview AS SELECT 1;
109115
SELECT * FROM pg_partition_tree('ptif_test_view');
110-
ERROR: "ptif_test_view" is not a table, a foreign table, or an index
116+
relid | parentrelid | isleaf | level
117+
-------+-------------+--------+-------
118+
| | |
119+
(1 row)
120+
111121
SELECT * FROM pg_partition_tree('ptif_test_matview');
112-
ERROR: "ptif_test_matview" is not a table, a foreign table, or an index
122+
relid | parentrelid | isleaf | level
123+
-------+-------------+--------+-------
124+
| | |
125+
(1 row)
126+
113127
DROP VIEW ptif_test_view;
114128
DROP MATERIALIZED VIEW ptif_test_matview;

‎src/test/regress/sql/partition_info.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
-- Tests for pg_partition_tree
33
--
44
SELECT*FROM pg_partition_tree(NULL);
5+
SELECT*FROM pg_partition_tree(0);
56

67
-- Test table partition trees
78
CREATETABLEptif_test (aint, bint) PARTITION BY range (a);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp