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

Commit70a3162

Browse files
committed
Revert "Fix parallel-safety check of expressions and predicate for index builds"
This reverts commiteae7be6, following a discussion with Tom Lane,due to concerns that this impacts the decisions made by the planner forthe number of workers spawned based on the inlining and const-folding ofindex expressions and predicate for cases that would have worked untilthis commit.Discussion:https://postgr.es/m/162802.1709746091@sss.pgh.pa.usBackpatch-through: 12
1 parentd769f9d commit70a3162

File tree

5 files changed

+2
-121
lines changed

5 files changed

+2
-121
lines changed

‎src/backend/optimizer/plan/planner.c‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6415,18 +6415,10 @@ plan_create_index_workers(Oid tableOid, Oid indexOid)
64156415
* Currently, parallel workers can't access the leader's temporary tables.
64166416
* Furthermore, any index predicate or index expressions must be parallel
64176417
* safe.
6418-
*
6419-
* Fetch the list of expressions and predicates directly from the
6420-
* catalogs. Retrieving this information from the relcache would cause
6421-
* the expressions and predicates to be flattened, losing properties that
6422-
* can be important to check if parallel workers can be used. For
6423-
* example, immutable parallel-unsafe functions, that cannot be used in
6424-
* parallel workers, would be changed to Const nodes, that are safe in
6425-
* parallel workers.
64266418
*/
64276419
if (heap->rd_rel->relpersistence==RELPERSISTENCE_TEMP||
6428-
!is_parallel_safe(root, (Node*)get_index_expressions(indexOid))||
6429-
!is_parallel_safe(root, (Node*)get_index_predicate(indexOid)))
6420+
!is_parallel_safe(root, (Node*)RelationGetIndexExpressions(index))||
6421+
!is_parallel_safe(root, (Node*)RelationGetIndexPredicate(index)))
64306422
{
64316423
parallel_workers=0;
64326424
gotodone;

‎src/backend/utils/cache/lsyscache.c‎

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -3352,74 +3352,6 @@ get_index_column_opclass(Oid index_oid, int attno)
33523352
returnopclass;
33533353
}
33543354

3355-
/*
3356-
* get_index_expressions
3357-
*
3358-
*Given the index OID, its a List of its expressions or NIL if none.
3359-
*/
3360-
List*
3361-
get_index_expressions(Oidindex_oid)
3362-
{
3363-
List*result;
3364-
HeapTupletuple;
3365-
DatumexprDatum;
3366-
boolisnull;
3367-
char*exprString;
3368-
3369-
tuple=SearchSysCache1(INDEXRELID,ObjectIdGetDatum(index_oid));
3370-
if (!HeapTupleIsValid(tuple))
3371-
elog(ERROR,"cache lookup failed for index %u",index_oid);
3372-
3373-
exprDatum=SysCacheGetAttr(INDEXRELID,tuple,
3374-
Anum_pg_index_indexprs,&isnull);
3375-
if (isnull)
3376-
{
3377-
ReleaseSysCache(tuple);
3378-
returnNIL;
3379-
}
3380-
3381-
exprString=TextDatumGetCString(exprDatum);
3382-
result= (List*)stringToNode(exprString);
3383-
pfree(exprString);
3384-
ReleaseSysCache(tuple);
3385-
3386-
returnresult;
3387-
}
3388-
3389-
/*
3390-
* get_index_predicate
3391-
*
3392-
*Given the index OID, return a List of its predicate or NIL if none.
3393-
*/
3394-
List*
3395-
get_index_predicate(Oidindex_oid)
3396-
{
3397-
List*result;
3398-
HeapTupletuple;
3399-
DatumpredDatum;
3400-
boolisnull;
3401-
char*predString;
3402-
3403-
tuple=SearchSysCache1(INDEXRELID,ObjectIdGetDatum(index_oid));
3404-
if (!HeapTupleIsValid(tuple))
3405-
elog(ERROR,"cache lookup failed for index %u",index_oid);
3406-
3407-
predDatum=SysCacheGetAttr(INDEXRELID,tuple,
3408-
Anum_pg_index_indpred,&isnull);
3409-
if (isnull)
3410-
{
3411-
ReleaseSysCache(tuple);
3412-
returnNIL;
3413-
}
3414-
3415-
predString=TextDatumGetCString(predDatum);
3416-
result= (List*)stringToNode(predString);
3417-
pfree(predString);
3418-
ReleaseSysCache(tuple);
3419-
3420-
returnresult;
3421-
}
3422-
34233355
/*
34243356
* get_index_isreplident
34253357
*

‎src/include/utils/lsyscache.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,6 @@ extern char *get_namespace_name_or_temp(Oid nspid);
185185
externOidget_range_subtype(OidrangeOid);
186186
externOidget_range_collation(OidrangeOid);
187187
externOidget_index_column_opclass(Oidindex_oid,intattno);
188-
externList*get_index_expressions(Oidindex_oid);
189-
externList*get_index_predicate(Oidindex_oid);
190188
externboolget_index_isreplident(Oidindex_oid);
191189
externboolget_index_isvalid(Oidindex_oid);
192190
externboolget_index_isclustered(Oidindex_oid);

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -341,22 +341,3 @@ CREATE INDEX btree_part_idx ON btree_part(id);
341341
ALTER INDEX btree_part_idx ALTER COLUMN id SET (n_distinct=100);
342342
ERROR: "btree_part_idx" is not a table, materialized view, or foreign table
343343
DROP TABLE btree_part;
344-
-- Test with index expression and predicate that include a parallel unsafe
345-
-- function.
346-
CREATE FUNCTION para_unsafe_f() RETURNS int IMMUTABLE PARALLEL UNSAFE
347-
AS $$
348-
BEGIN
349-
RETURN 0;
350-
EXCEPTION WHEN OTHERS THEN
351-
RETURN 1;
352-
END$$ LANGUAGE plpgsql;
353-
CREATE TABLE btree_para_bld(i int);
354-
ALTER TABLE btree_para_bld SET (parallel_workers = 4);
355-
SET max_parallel_maintenance_workers TO 4;
356-
-- With parallel-unsafe expression
357-
CREATE INDEX ON btree_para_bld((i + para_unsafe_f()));
358-
-- With parallel-unsafe predicate
359-
CREATE INDEX ON btree_para_bld(i) WHERE i > para_unsafe_f();
360-
RESET max_parallel_maintenance_workers;
361-
DROP TABLE btree_para_bld;
362-
DROP FUNCTION para_unsafe_f;

‎src/test/regress/sql/btree_index.sql‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -183,25 +183,3 @@ CREATE TABLE btree_part (id int4) PARTITION BY RANGE (id);
183183
CREATEINDEXbtree_part_idxON btree_part(id);
184184
ALTERINDEX btree_part_idx ALTER COLUMN idSET (n_distinct=100);
185185
DROPTABLE btree_part;
186-
187-
-- Test with index expression and predicate that include a parallel unsafe
188-
-- function.
189-
CREATEFUNCTIONpara_unsafe_f() RETURNSint IMMUTABLE PARALLEL UNSAFE
190-
AS $$
191-
BEGIN
192-
RETURN0;
193-
EXCEPTION WHEN OTHERS THEN
194-
RETURN1;
195-
END$$ LANGUAGE plpgsql;
196-
197-
CREATETABLEbtree_para_bld(iint);
198-
ALTERTABLE btree_para_bldSET (parallel_workers=4);
199-
SET max_parallel_maintenance_workers TO4;
200-
-- With parallel-unsafe expression
201-
CREATEINDEXON btree_para_bld((i+ para_unsafe_f()));
202-
-- With parallel-unsafe predicate
203-
CREATEINDEXON btree_para_bld(i)WHERE i> para_unsafe_f();
204-
205-
RESET max_parallel_maintenance_workers;
206-
DROPTABLE btree_para_bld;
207-
DROPFUNCTION para_unsafe_f;

0 commit comments

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