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

Commitad08006

Browse files
committed
Fix event triggers for partitioned tables
Index DDL cascading on partitioned tables introduced a way for ALTERTABLE to be called reentrantly. This caused an an important deficiencyin event trigger support to be exposed: on exiting the reentrant call,the alter table state object was clobbered, causing a crash when theouter alter table tries to finalize its processing. Fix the crash bycreating a stack of event trigger state objects. There are still waysto cause things to misbehave (and probably other crashers) with moreelaborate tricks, but at least it now doesn't crash in the obviousscenario.Backpatch to 9.5, where DDL deparsing of event triggers was introduced.Reported-by: Marco SlotAuthors: Michaël Paquier, Álvaro HerreraDiscussion:https://postgr.es/m/CANNhMLCpi+HQ7M36uPfGbJZEQLyTy7XvX=5EFkpR-b1bo0uJew@mail.gmail.com
1 parent29ef2b3 commitad08006

File tree

11 files changed

+78
-11
lines changed

11 files changed

+78
-11
lines changed

‎src/backend/catalog/index.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#include"catalog/pg_type.h"
5151
#include"catalog/storage.h"
5252
#include"commands/tablecmds.h"
53+
#include"commands/event_trigger.h"
5354
#include"commands/trigger.h"
5455
#include"executor/executor.h"
5556
#include"miscadmin.h"
@@ -212,7 +213,8 @@ relationHasPrimaryKey(Relation rel)
212213
void
213214
index_check_primary_key(RelationheapRel,
214215
IndexInfo*indexInfo,
215-
boolis_alter_table)
216+
boolis_alter_table,
217+
IndexStmt*stmt)
216218
{
217219
List*cmds;
218220
inti;
@@ -280,7 +282,11 @@ index_check_primary_key(Relation heapRel,
280282
* unduly.
281283
*/
282284
if (cmds)
285+
{
286+
EventTriggerAlterTableStart((Node*)stmt);
283287
AlterTableInternal(RelationGetRelid(heapRel),cmds, true);
288+
EventTriggerAlterTableEnd();
289+
}
284290
}
285291

286292
/*

‎src/backend/commands/event_trigger.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1696,11 +1696,6 @@ EventTriggerCollectSimpleCommand(ObjectAddress address,
16961696
* Note we don't collect the command immediately; instead we keep it in
16971697
* currentCommand, and only when we're done processing the subcommands we will
16981698
* add it to the command list.
1699-
*
1700-
* XXX -- this API isn't considering the possibility of an ALTER TABLE command
1701-
* being called reentrantly by an event trigger function. Do we need stackable
1702-
* commands at this level?Perhaps at least we should detect the condition and
1703-
* raise an error.
17041699
*/
17051700
void
17061701
EventTriggerAlterTableStart(Node*parsetree)
@@ -1725,6 +1720,7 @@ EventTriggerAlterTableStart(Node *parsetree)
17251720
command->d.alterTable.subcmds=NIL;
17261721
command->parsetree=copyObject(parsetree);
17271722

1723+
command->parent=currentEventTriggerState->currentCommand;
17281724
currentEventTriggerState->currentCommand=command;
17291725

17301726
MemoryContextSwitchTo(oldcxt);
@@ -1765,6 +1761,7 @@ EventTriggerCollectAlterTableSubcmd(Node *subcmd, ObjectAddress address)
17651761
return;
17661762

17671763
Assert(IsA(subcmd,AlterTableCmd));
1764+
Assert(OidIsValid(currentEventTriggerState->currentCommand));
17681765
Assert(OidIsValid(currentEventTriggerState->currentCommand->d.alterTable.objectId));
17691766

17701767
oldcxt=MemoryContextSwitchTo(currentEventTriggerState->cxt);
@@ -1790,11 +1787,15 @@ EventTriggerCollectAlterTableSubcmd(Node *subcmd, ObjectAddress address)
17901787
void
17911788
EventTriggerAlterTableEnd(void)
17921789
{
1790+
CollectedCommand*parent;
1791+
17931792
/* ignore if event trigger context not set, or collection disabled */
17941793
if (!currentEventTriggerState||
17951794
currentEventTriggerState->commandCollectionInhibited)
17961795
return;
17971796

1797+
parent=currentEventTriggerState->currentCommand->parent;
1798+
17981799
/* If no subcommands, don't collect */
17991800
if (list_length(currentEventTriggerState->currentCommand->d.alterTable.subcmds)!=0)
18001801
{
@@ -1805,7 +1806,7 @@ EventTriggerAlterTableEnd(void)
18051806
else
18061807
pfree(currentEventTriggerState->currentCommand);
18071808

1808-
currentEventTriggerState->currentCommand=NULL;
1809+
currentEventTriggerState->currentCommand=parent;
18091810
}
18101811

18111812
/*

‎src/backend/commands/indexcmds.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include"commands/comment.h"
3535
#include"commands/dbcommands.h"
3636
#include"commands/defrem.h"
37+
#include"commands/event_trigger.h"
3738
#include"commands/tablecmds.h"
3839
#include"commands/tablespace.h"
3940
#include"mb/pg_wchar.h"
@@ -666,7 +667,7 @@ DefineIndex(Oid relationId,
666667
* Extra checks when creating a PRIMARY KEY index.
667668
*/
668669
if (stmt->primary)
669-
index_check_primary_key(rel,indexInfo,is_alter_table);
670+
index_check_primary_key(rel,indexInfo,is_alter_table,stmt);
670671

671672
/*
672673
* If this table is partitioned and we're creating a unique index or a

‎src/backend/commands/tablecmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7074,7 +7074,7 @@ ATExecAddIndexConstraint(AlteredTableInfo *tab, Relation rel,
70747074

70757075
/* Extra checks needed if making primary key */
70767076
if (stmt->primary)
7077-
index_check_primary_key(rel,indexInfo, true);
7077+
index_check_primary_key(rel,indexInfo, true,stmt);
70787078

70797079
/* Note we currently don't support EXCLUSION constraints here */
70807080
if (stmt->primary)

‎src/backend/commands/view.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ validateWithCheckOption(const char *value)
6161
*
6262
* Create a view relation and use the rules system to store the query
6363
* for the view.
64+
*
65+
* EventTriggerAlterTableStart must have been called already.
6466
*---------------------------------------------------------------------
6567
*/
6668
staticObjectAddress
@@ -186,6 +188,7 @@ DefineVirtualRelation(RangeVar *relation, List *tlist, bool replace,
186188
atcmds=lappend(atcmds,atcmd);
187189
}
188190

191+
/* EventTriggerAlterTableStart called by ProcessUtilitySlow */
189192
AlterTableInternal(viewOid,atcmds, true);
190193

191194
/* Make the new view columns visible */
@@ -217,6 +220,7 @@ DefineVirtualRelation(RangeVar *relation, List *tlist, bool replace,
217220
atcmd->def= (Node*)options;
218221
atcmds=list_make1(atcmd);
219222

223+
/* EventTriggerAlterTableStart called by ProcessUtilitySlow */
220224
AlterTableInternal(viewOid,atcmds, true);
221225

222226
ObjectAddressSet(address,RelationRelationId,viewOid);

‎src/include/catalog/index.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ typedef enum
4040

4141
externvoidindex_check_primary_key(RelationheapRel,
4242
IndexInfo*indexInfo,
43-
boolis_alter_table);
43+
boolis_alter_table,
44+
IndexStmt*stmt);
4445

4546
#defineINDEX_CREATE_IS_PRIMARY(1 << 0)
4647
#defineINDEX_CREATE_ADD_CONSTRAINT(1 << 1)

‎src/include/tcop/deparse_utility.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ typedef struct CollectedATSubcmd
4444
typedefstructCollectedCommand
4545
{
4646
CollectedCommandTypetype;
47+
4748
boolin_extension;
4849
Node*parsetree;
4950

@@ -100,6 +101,8 @@ typedef struct CollectedCommand
100101
ObjectTypeobjtype;
101102
}defprivs;
102103
}d;
104+
105+
structCollectedCommand*parent;/* when nested */
103106
}CollectedCommand;
104107

105108
#endif/* DEPARSE_UTILITY_H */

‎src/test/modules/test_ddl_deparse/expected/alter_table.out

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,15 @@ NOTICE: DDL test: type simple, tag ALTER TABLE
1616
ALTER TABLE parent ADD CONSTRAINT a_pos CHECK (a > 0);
1717
NOTICE: DDL test: type alter table, tag ALTER TABLE
1818
NOTICE: subcommand: ADD CONSTRAINT (and recurse)
19+
CREATE TABLE part (
20+
a int
21+
) PARTITION BY RANGE (a);
22+
NOTICE: DDL test: type simple, tag CREATE TABLE
23+
CREATE TABLE part1 PARTITION OF part FOR VALUES FROM (1) to (100);
24+
NOTICE: DDL test: type simple, tag CREATE TABLE
25+
ALTER TABLE part ADD PRIMARY KEY (a);
26+
NOTICE: DDL test: type alter table, tag CREATE INDEX
27+
NOTICE: subcommand: SET NOT NULL
28+
NOTICE: subcommand: SET NOT NULL
29+
NOTICE: DDL test: type alter table, tag ALTER TABLE
30+
NOTICE: subcommand: ADD INDEX

‎src/test/modules/test_ddl_deparse/sql/alter_table.sql

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,11 @@ ALTER TABLE parent ADD COLUMN b serial;
1111
ALTERTABLE parent RENAME COLUMN b TO c;
1212

1313
ALTERTABLE parent ADDCONSTRAINT a_posCHECK (a>0);
14+
15+
CREATETABLEpart (
16+
aint
17+
) PARTITION BY RANGE (a);
18+
19+
CREATETABLEpart1 PARTITION OF part FORVALUESFROM (1) to (100);
20+
21+
ALTERTABLE part ADDPRIMARY KEY (a);

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,18 @@ CREATE SCHEMA evttrig
349349
CREATE TABLE one (col_a SERIAL PRIMARY KEY, col_b text DEFAULT 'forty two')
350350
CREATE INDEX one_idx ON one (col_b)
351351
CREATE TABLE two (col_c INTEGER CHECK (col_c > 0) REFERENCES one DEFAULT 42);
352+
-- Partitioned tables with a partitioned index
353+
CREATE TABLE evttrig.parted (
354+
id int PRIMARY KEY)
355+
PARTITION BY RANGE (id);
356+
CREATE TABLE evttrig.part_1_10 PARTITION OF evttrig.parted (id)
357+
FOR VALUES FROM (1) TO (10);
358+
CREATE TABLE evttrig.part_10_20 PARTITION OF evttrig.parted (id)
359+
FOR VALUES FROM (10) TO (20) PARTITION BY RANGE (id);
360+
CREATE TABLE evttrig.part_10_15 PARTITION OF evttrig.part_10_20 (id)
361+
FOR VALUES FROM (10) TO (15);
362+
CREATE TABLE evttrig.part_15_20 PARTITION OF evttrig.part_10_20 (id)
363+
FOR VALUES FROM (15) TO (20);
352364
ALTER TABLE evttrig.two DROP COLUMN col_c;
353365
NOTICE: NORMAL: orig=t normal=f istemp=f type=table column identity=evttrig.two.col_c name={evttrig,two,col_c} args={}
354366
NOTICE: NORMAL: orig=f normal=t istemp=f type=table constraint identity=two_col_c_check on evttrig.two name={evttrig,two,two_col_c_check} args={}
@@ -359,14 +371,20 @@ NOTICE: NORMAL: orig=t normal=f istemp=f type=table constraint identity=one_pke
359371
DROP INDEX evttrig.one_idx;
360372
NOTICE: NORMAL: orig=t normal=f istemp=f type=index identity=evttrig.one_idx name={evttrig,one_idx} args={}
361373
DROP SCHEMA evttrig CASCADE;
362-
NOTICE: drop cascades to2 other objects
374+
NOTICE: drop cascades to3 other objects
363375
DETAIL: drop cascades to table evttrig.one
364376
drop cascades to table evttrig.two
377+
drop cascades to table evttrig.parted
365378
NOTICE: NORMAL: orig=t normal=f istemp=f type=schema identity=evttrig name={evttrig} args={}
366379
NOTICE: NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.one name={evttrig,one} args={}
367380
NOTICE: NORMAL: orig=f normal=t istemp=f type=sequence identity=evttrig.one_col_a_seq name={evttrig,one_col_a_seq} args={}
368381
NOTICE: NORMAL: orig=f normal=t istemp=f type=default value identity=for evttrig.one.col_a name={evttrig,one,col_a} args={}
369382
NOTICE: NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.two name={evttrig,two} args={}
383+
NOTICE: NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.parted name={evttrig,parted} args={}
384+
NOTICE: NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_1_10 name={evttrig,part_1_10} args={}
385+
NOTICE: NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_10_20 name={evttrig,part_10_20} args={}
386+
NOTICE: NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_10_15 name={evttrig,part_10_15} args={}
387+
NOTICE: NORMAL: orig=f normal=t istemp=f type=table identity=evttrig.part_15_20 name={evttrig,part_15_20} args={}
370388
DROP TABLE a_temp_tbl;
371389
NOTICE: NORMAL: orig=t normal=f istemp=t type=table identity=pg_temp.a_temp_tbl name={pg_temp,a_temp_tbl} args={}
372390
DROP EVENT TRIGGER regress_event_trigger_report_dropped;

‎src/test/regress/sql/event_trigger.sql

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,19 @@ CREATE SCHEMA evttrig
274274
CREATEINDEXone_idxON one (col_b)
275275
CREATETABLEtwo (col_cINTEGERCHECK (col_c>0)REFERENCES one DEFAULT42);
276276

277+
-- Partitioned tables with a partitioned index
278+
CREATETABLEevttrig.parted (
279+
idintPRIMARY KEY)
280+
PARTITION BY RANGE (id);
281+
CREATETABLEevttrig.part_1_10 PARTITION OFevttrig.parted (id)
282+
FORVALUESFROM (1) TO (10);
283+
CREATETABLEevttrig.part_10_20 PARTITION OFevttrig.parted (id)
284+
FORVALUESFROM (10) TO (20) PARTITION BY RANGE (id);
285+
CREATETABLEevttrig.part_10_15 PARTITION OFevttrig.part_10_20 (id)
286+
FORVALUESFROM (10) TO (15);
287+
CREATETABLEevttrig.part_15_20 PARTITION OFevttrig.part_10_20 (id)
288+
FORVALUESFROM (15) TO (20);
289+
277290
ALTERTABLEevttrig.two DROP COLUMN col_c;
278291
ALTERTABLEevttrig.one ALTER COLUMN col_b DROP DEFAULT;
279292
ALTERTABLEevttrig.one DROPCONSTRAINT one_pkey;

0 commit comments

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