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

Commit66bb74d

Browse files
committed
Arrange for the pg_foo_is_visible and has_foo_privilege families of functions
to return NULL, instead of erroring out, if the target object is specified byOID and we can't find that OID in the catalogs. Since these functions operateinternally on SnapshotNow rules, there is a race condition when using themin user queries: the query's MVCC snapshot might "see" a catalog row that'salready committed dead, leading to a failure when the inquiry function isapplied. Returning NULL should generally provide more convenient behavior.This issue has been complained of before, and in particular we are now seeingit in the regression tests due to another recent patch.
1 parent3f7e1e4 commit66bb74d

File tree

3 files changed

+148
-8
lines changed

3 files changed

+148
-8
lines changed

‎src/backend/catalog/namespace.c

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Portions Copyright (c) 1994, Regents of the University of California
1414
*
1515
* IDENTIFICATION
16-
* $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.113 2008/12/04 17:51:26 petere Exp $
16+
* $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.114 2008/12/15 18:09:40 tgl Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
@@ -3250,13 +3250,27 @@ fetch_search_path_array(Oid *sarray, int sarray_len)
32503250

32513251
/*
32523252
* Export the FooIsVisible functions as SQL-callable functions.
3253+
*
3254+
* Note: as of Postgres 8.4, these will silently return NULL if called on
3255+
* a nonexistent object OID, rather than failing. This is to avoid race
3256+
* condition errors when a query that's scanning a catalog using an MVCC
3257+
* snapshot uses one of these functions. The underlying IsVisible functions
3258+
* operate on SnapshotNow semantics and so might see the object as already
3259+
* gone when it's still visible to the MVCC snapshot. (There is no race
3260+
* condition in the current coding because we don't accept sinval messages
3261+
* between the SearchSysCacheExists test and the subsequent lookup.)
32533262
*/
32543263

32553264
Datum
32563265
pg_table_is_visible(PG_FUNCTION_ARGS)
32573266
{
32583267
Oidoid=PG_GETARG_OID(0);
32593268

3269+
if (!SearchSysCacheExists(RELOID,
3270+
ObjectIdGetDatum(oid),
3271+
0,0,0))
3272+
PG_RETURN_NULL();
3273+
32603274
PG_RETURN_BOOL(RelationIsVisible(oid));
32613275
}
32623276

@@ -3265,6 +3279,11 @@ pg_type_is_visible(PG_FUNCTION_ARGS)
32653279
{
32663280
Oidoid=PG_GETARG_OID(0);
32673281

3282+
if (!SearchSysCacheExists(TYPEOID,
3283+
ObjectIdGetDatum(oid),
3284+
0,0,0))
3285+
PG_RETURN_NULL();
3286+
32683287
PG_RETURN_BOOL(TypeIsVisible(oid));
32693288
}
32703289

@@ -3273,6 +3292,11 @@ pg_function_is_visible(PG_FUNCTION_ARGS)
32733292
{
32743293
Oidoid=PG_GETARG_OID(0);
32753294

3295+
if (!SearchSysCacheExists(PROCOID,
3296+
ObjectIdGetDatum(oid),
3297+
0,0,0))
3298+
PG_RETURN_NULL();
3299+
32763300
PG_RETURN_BOOL(FunctionIsVisible(oid));
32773301
}
32783302

@@ -3281,6 +3305,11 @@ pg_operator_is_visible(PG_FUNCTION_ARGS)
32813305
{
32823306
Oidoid=PG_GETARG_OID(0);
32833307

3308+
if (!SearchSysCacheExists(OPEROID,
3309+
ObjectIdGetDatum(oid),
3310+
0,0,0))
3311+
PG_RETURN_NULL();
3312+
32843313
PG_RETURN_BOOL(OperatorIsVisible(oid));
32853314
}
32863315

@@ -3289,6 +3318,11 @@ pg_opclass_is_visible(PG_FUNCTION_ARGS)
32893318
{
32903319
Oidoid=PG_GETARG_OID(0);
32913320

3321+
if (!SearchSysCacheExists(CLAOID,
3322+
ObjectIdGetDatum(oid),
3323+
0,0,0))
3324+
PG_RETURN_NULL();
3325+
32923326
PG_RETURN_BOOL(OpclassIsVisible(oid));
32933327
}
32943328

@@ -3297,6 +3331,11 @@ pg_conversion_is_visible(PG_FUNCTION_ARGS)
32973331
{
32983332
Oidoid=PG_GETARG_OID(0);
32993333

3334+
if (!SearchSysCacheExists(CONVOID,
3335+
ObjectIdGetDatum(oid),
3336+
0,0,0))
3337+
PG_RETURN_NULL();
3338+
33003339
PG_RETURN_BOOL(ConversionIsVisible(oid));
33013340
}
33023341

@@ -3305,6 +3344,11 @@ pg_ts_parser_is_visible(PG_FUNCTION_ARGS)
33053344
{
33063345
Oidoid=PG_GETARG_OID(0);
33073346

3347+
if (!SearchSysCacheExists(TSPARSEROID,
3348+
ObjectIdGetDatum(oid),
3349+
0,0,0))
3350+
PG_RETURN_NULL();
3351+
33083352
PG_RETURN_BOOL(TSParserIsVisible(oid));
33093353
}
33103354

@@ -3313,6 +3357,11 @@ pg_ts_dict_is_visible(PG_FUNCTION_ARGS)
33133357
{
33143358
Oidoid=PG_GETARG_OID(0);
33153359

3360+
if (!SearchSysCacheExists(TSDICTOID,
3361+
ObjectIdGetDatum(oid),
3362+
0,0,0))
3363+
PG_RETURN_NULL();
3364+
33163365
PG_RETURN_BOOL(TSDictionaryIsVisible(oid));
33173366
}
33183367

@@ -3321,6 +3370,11 @@ pg_ts_template_is_visible(PG_FUNCTION_ARGS)
33213370
{
33223371
Oidoid=PG_GETARG_OID(0);
33233372

3373+
if (!SearchSysCacheExists(TSTEMPLATEOID,
3374+
ObjectIdGetDatum(oid),
3375+
0,0,0))
3376+
PG_RETURN_NULL();
3377+
33243378
PG_RETURN_BOOL(TSTemplateIsVisible(oid));
33253379
}
33263380

@@ -3329,6 +3383,11 @@ pg_ts_config_is_visible(PG_FUNCTION_ARGS)
33293383
{
33303384
Oidoid=PG_GETARG_OID(0);
33313385

3386+
if (!SearchSysCacheExists(TSCONFIGOID,
3387+
ObjectIdGetDatum(oid),
3388+
0,0,0))
3389+
PG_RETURN_NULL();
3390+
33323391
PG_RETURN_BOOL(TSConfigIsVisible(oid));
33333392
}
33343393

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

Lines changed: 83 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/acl.c,v 1.142 2008/09/09 18:58:08 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/acl.c,v 1.143 2008/12/15 18:09:41 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1361,7 +1361,9 @@ convert_priv_string(text *priv_type_text)
13611361
*user name, user OID, or implicit user = current_user.
13621362
*
13631363
*The result is a boolean value: true if user has the indicated
1364-
*privilege, false if not.
1364+
*privilege, false if not. The variants that take a relation OID
1365+
*return NULL if the OID doesn't exist (rather than failing, as
1366+
*they did before Postgres 8.4).
13651367
*/
13661368

13671369
/*
@@ -1432,6 +1434,11 @@ has_table_privilege_name_id(PG_FUNCTION_ARGS)
14321434
roleid=get_roleid_checked(NameStr(*username));
14331435
mode=convert_table_priv_string(priv_type_text);
14341436

1437+
if (!SearchSysCacheExists(RELOID,
1438+
ObjectIdGetDatum(tableoid),
1439+
0,0,0))
1440+
PG_RETURN_NULL();
1441+
14351442
aclresult=pg_class_aclcheck(tableoid,roleid,mode);
14361443

14371444
PG_RETURN_BOOL(aclresult==ACLCHECK_OK);
@@ -1455,6 +1462,11 @@ has_table_privilege_id(PG_FUNCTION_ARGS)
14551462
roleid=GetUserId();
14561463
mode=convert_table_priv_string(priv_type_text);
14571464

1465+
if (!SearchSysCacheExists(RELOID,
1466+
ObjectIdGetDatum(tableoid),
1467+
0,0,0))
1468+
PG_RETURN_NULL();
1469+
14581470
aclresult=pg_class_aclcheck(tableoid,roleid,mode);
14591471

14601472
PG_RETURN_BOOL(aclresult==ACLCHECK_OK);
@@ -1499,6 +1511,11 @@ has_table_privilege_id_id(PG_FUNCTION_ARGS)
14991511

15001512
mode=convert_table_priv_string(priv_type_text);
15011513

1514+
if (!SearchSysCacheExists(RELOID,
1515+
ObjectIdGetDatum(tableoid),
1516+
0,0,0))
1517+
PG_RETURN_NULL();
1518+
15021519
aclresult=pg_class_aclcheck(tableoid,roleid,mode);
15031520

15041521
PG_RETURN_BOOL(aclresult==ACLCHECK_OK);
@@ -1587,7 +1604,7 @@ convert_table_priv_string(text *priv_type_text)
15871604
*user name, user OID, or implicit user = current_user.
15881605
*
15891606
*The result is a boolean value: true if user has the indicated
1590-
*privilege, false if not.
1607+
*privilege, false if not, or NULL if object doesn't exist.
15911608
*/
15921609

15931610
/*
@@ -1658,6 +1675,11 @@ has_database_privilege_name_id(PG_FUNCTION_ARGS)
16581675
roleid=get_roleid_checked(NameStr(*username));
16591676
mode=convert_database_priv_string(priv_type_text);
16601677

1678+
if (!SearchSysCacheExists(DATABASEOID,
1679+
ObjectIdGetDatum(databaseoid),
1680+
0,0,0))
1681+
PG_RETURN_NULL();
1682+
16611683
aclresult=pg_database_aclcheck(databaseoid,roleid,mode);
16621684

16631685
PG_RETURN_BOOL(aclresult==ACLCHECK_OK);
@@ -1681,6 +1703,11 @@ has_database_privilege_id(PG_FUNCTION_ARGS)
16811703
roleid=GetUserId();
16821704
mode=convert_database_priv_string(priv_type_text);
16831705

1706+
if (!SearchSysCacheExists(DATABASEOID,
1707+
ObjectIdGetDatum(databaseoid),
1708+
0,0,0))
1709+
PG_RETURN_NULL();
1710+
16841711
aclresult=pg_database_aclcheck(databaseoid,roleid,mode);
16851712

16861713
PG_RETURN_BOOL(aclresult==ACLCHECK_OK);
@@ -1725,6 +1752,11 @@ has_database_privilege_id_id(PG_FUNCTION_ARGS)
17251752

17261753
mode=convert_database_priv_string(priv_type_text);
17271754

1755+
if (!SearchSysCacheExists(DATABASEOID,
1756+
ObjectIdGetDatum(databaseoid),
1757+
0,0,0))
1758+
PG_RETURN_NULL();
1759+
17281760
aclresult=pg_database_aclcheck(databaseoid,roleid,mode);
17291761

17301762
PG_RETURN_BOOL(aclresult==ACLCHECK_OK);
@@ -1798,7 +1830,7 @@ convert_database_priv_string(text *priv_type_text)
17981830
*user name, user OID, or implicit user = current_user.
17991831
*
18001832
*The result is a boolean value: true if user has the indicated
1801-
*privilege, false if not.
1833+
*privilege, false if not, or NULL if object doesn't exist.
18021834
*/
18031835

18041836
/*
@@ -1869,6 +1901,11 @@ has_function_privilege_name_id(PG_FUNCTION_ARGS)
18691901
roleid=get_roleid_checked(NameStr(*username));
18701902
mode=convert_function_priv_string(priv_type_text);
18711903

1904+
if (!SearchSysCacheExists(PROCOID,
1905+
ObjectIdGetDatum(functionoid),
1906+
0,0,0))
1907+
PG_RETURN_NULL();
1908+
18721909
aclresult=pg_proc_aclcheck(functionoid,roleid,mode);
18731910

18741911
PG_RETURN_BOOL(aclresult==ACLCHECK_OK);
@@ -1892,6 +1929,11 @@ has_function_privilege_id(PG_FUNCTION_ARGS)
18921929
roleid=GetUserId();
18931930
mode=convert_function_priv_string(priv_type_text);
18941931

1932+
if (!SearchSysCacheExists(PROCOID,
1933+
ObjectIdGetDatum(functionoid),
1934+
0,0,0))
1935+
PG_RETURN_NULL();
1936+
18951937
aclresult=pg_proc_aclcheck(functionoid,roleid,mode);
18961938

18971939
PG_RETURN_BOOL(aclresult==ACLCHECK_OK);
@@ -1936,6 +1978,11 @@ has_function_privilege_id_id(PG_FUNCTION_ARGS)
19361978

19371979
mode=convert_function_priv_string(priv_type_text);
19381980

1981+
if (!SearchSysCacheExists(PROCOID,
1982+
ObjectIdGetDatum(functionoid),
1983+
0,0,0))
1984+
PG_RETURN_NULL();
1985+
19391986
aclresult=pg_proc_aclcheck(functionoid,roleid,mode);
19401987

19411988
PG_RETURN_BOOL(aclresult==ACLCHECK_OK);
@@ -1996,7 +2043,7 @@ convert_function_priv_string(text *priv_type_text)
19962043
*user name, user OID, or implicit user = current_user.
19972044
*
19982045
*The result is a boolean value: true if user has the indicated
1999-
*privilege, false if not.
2046+
*privilege, false if not, or NULL if object doesn't exist.
20002047
*/
20012048

20022049
/*
@@ -2067,6 +2114,11 @@ has_language_privilege_name_id(PG_FUNCTION_ARGS)
20672114
roleid=get_roleid_checked(NameStr(*username));
20682115
mode=convert_language_priv_string(priv_type_text);
20692116

2117+
if (!SearchSysCacheExists(LANGOID,
2118+
ObjectIdGetDatum(languageoid),
2119+
0,0,0))
2120+
PG_RETURN_NULL();
2121+
20702122
aclresult=pg_language_aclcheck(languageoid,roleid,mode);
20712123

20722124
PG_RETURN_BOOL(aclresult==ACLCHECK_OK);
@@ -2090,6 +2142,11 @@ has_language_privilege_id(PG_FUNCTION_ARGS)
20902142
roleid=GetUserId();
20912143
mode=convert_language_priv_string(priv_type_text);
20922144

2145+
if (!SearchSysCacheExists(LANGOID,
2146+
ObjectIdGetDatum(languageoid),
2147+
0,0,0))
2148+
PG_RETURN_NULL();
2149+
20932150
aclresult=pg_language_aclcheck(languageoid,roleid,mode);
20942151

20952152
PG_RETURN_BOOL(aclresult==ACLCHECK_OK);
@@ -2134,6 +2191,11 @@ has_language_privilege_id_id(PG_FUNCTION_ARGS)
21342191

21352192
mode=convert_language_priv_string(priv_type_text);
21362193

2194+
if (!SearchSysCacheExists(LANGOID,
2195+
ObjectIdGetDatum(languageoid),
2196+
0,0,0))
2197+
PG_RETURN_NULL();
2198+
21372199
aclresult=pg_language_aclcheck(languageoid,roleid,mode);
21382200

21392201
PG_RETURN_BOOL(aclresult==ACLCHECK_OK);
@@ -2194,7 +2256,7 @@ convert_language_priv_string(text *priv_type_text)
21942256
*user name, user OID, or implicit user = current_user.
21952257
*
21962258
*The result is a boolean value: true if user has the indicated
2197-
*privilege, false if not.
2259+
*privilege, false if not, or NULL if object doesn't exist.
21982260
*/
21992261

22002262
/*
@@ -2265,6 +2327,11 @@ has_schema_privilege_name_id(PG_FUNCTION_ARGS)
22652327
roleid=get_roleid_checked(NameStr(*username));
22662328
mode=convert_schema_priv_string(priv_type_text);
22672329

2330+
if (!SearchSysCacheExists(NAMESPACEOID,
2331+
ObjectIdGetDatum(schemaoid),
2332+
0,0,0))
2333+
PG_RETURN_NULL();
2334+
22682335
aclresult=pg_namespace_aclcheck(schemaoid,roleid,mode);
22692336

22702337
PG_RETURN_BOOL(aclresult==ACLCHECK_OK);
@@ -2288,6 +2355,11 @@ has_schema_privilege_id(PG_FUNCTION_ARGS)
22882355
roleid=GetUserId();
22892356
mode=convert_schema_priv_string(priv_type_text);
22902357

2358+
if (!SearchSysCacheExists(NAMESPACEOID,
2359+
ObjectIdGetDatum(schemaoid),
2360+
0,0,0))
2361+
PG_RETURN_NULL();
2362+
22912363
aclresult=pg_namespace_aclcheck(schemaoid,roleid,mode);
22922364

22932365
PG_RETURN_BOOL(aclresult==ACLCHECK_OK);
@@ -2332,6 +2404,11 @@ has_schema_privilege_id_id(PG_FUNCTION_ARGS)
23322404

23332405
mode=convert_schema_priv_string(priv_type_text);
23342406

2407+
if (!SearchSysCacheExists(NAMESPACEOID,
2408+
ObjectIdGetDatum(schemaoid),
2409+
0,0,0))
2410+
PG_RETURN_NULL();
2411+
23352412
aclresult=pg_namespace_aclcheck(schemaoid,roleid,mode);
23362413

23372414
PG_RETURN_BOOL(aclresult==ACLCHECK_OK);

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,11 @@ ERROR: unrecognized privilege type: "sel"
321321
select has_table_privilege(-999999,'pg_authid','update');
322322
ERROR: role with OID 4293967297 does not exist
323323
select has_table_privilege(1,'select');
324-
ERROR: relation with OID 1 does not exist
324+
has_table_privilege
325+
---------------------
326+
327+
(1 row)
328+
325329
-- superuser
326330
\c -
327331
select has_table_privilege(current_user,'pg_authid','select');

0 commit comments

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