Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit be634f0

Browse files
funbringerfunbringer
committedJun 19, 2017
improved support for rowmarks (select for share; update; delete; etc)
1 parent 62e4952 commit be634f0

File tree

7 files changed

+234
-185
lines changed

7 files changed

+234
-185
lines changed
 

‎expected/pathman_rowmarks.out

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,148 @@ FOR SHARE;
168168
6
169169
(1 row)
170170

171+
/* Check updates (plan) */
172+
EXPLAIN (COSTS OFF)
173+
UPDATE rowmarks.second SET id = 2
174+
WHERE rowmarks.second.id IN (SELECT id FROM rowmarks.first WHERE id = 1);
175+
QUERY PLAN
176+
---------------------------------------------
177+
Update on second
178+
-> Nested Loop Semi Join
179+
-> Seq Scan on second
180+
Filter: (id = 1)
181+
-> Materialize
182+
-> Append
183+
-> Seq Scan on first_0
184+
Filter: (id = 1)
185+
(8 rows)
186+
187+
EXPLAIN (COSTS OFF)
188+
UPDATE rowmarks.second SET id = 2
189+
WHERE rowmarks.second.id IN (SELECT id FROM rowmarks.first WHERE id < 1);
190+
QUERY PLAN
191+
---------------------------------------------------
192+
Update on second
193+
-> Hash Join
194+
Hash Cond: (second.id = first_0.id)
195+
-> Seq Scan on second
196+
-> Hash
197+
-> HashAggregate
198+
Group Key: first_0.id
199+
-> Append
200+
-> Seq Scan on first_0
201+
Filter: (id < 1)
202+
-> Seq Scan on first_1
203+
Filter: (id < 1)
204+
-> Seq Scan on first_2
205+
Filter: (id < 1)
206+
-> Seq Scan on first_3
207+
Filter: (id < 1)
208+
-> Seq Scan on first_4
209+
Filter: (id < 1)
210+
(18 rows)
211+
212+
EXPLAIN (COSTS OFF)
213+
UPDATE rowmarks.second SET id = 2
214+
WHERE rowmarks.second.id IN (SELECT id FROM rowmarks.first WHERE id = 1 OR id = 2);
215+
QUERY PLAN
216+
---------------------------------------------
217+
Update on second
218+
-> Hash Semi Join
219+
Hash Cond: (second.id = first_0.id)
220+
-> Seq Scan on second
221+
-> Hash
222+
-> Append
223+
-> Seq Scan on first_0
224+
Filter: (id = 1)
225+
-> Seq Scan on first_1
226+
Filter: (id = 2)
227+
(10 rows)
228+
229+
EXPLAIN (COSTS OFF)
230+
UPDATE rowmarks.second SET id = 2
231+
WHERE rowmarks.second.id IN (SELECT id FROM rowmarks.first WHERE id = 1)
232+
RETURNING *, tableoid::regclass;
233+
QUERY PLAN
234+
---------------------------------------------
235+
Update on second
236+
-> Nested Loop Semi Join
237+
-> Seq Scan on second
238+
Filter: (id = 1)
239+
-> Materialize
240+
-> Append
241+
-> Seq Scan on first_0
242+
Filter: (id = 1)
243+
(8 rows)
244+
245+
/* Check updates (execution) */
246+
UPDATE rowmarks.second SET id = 1
247+
WHERE rowmarks.second.id IN (SELECT id FROM rowmarks.first WHERE id = 1 OR id = 2)
248+
RETURNING *, tableoid::regclass;
249+
id | tableoid
250+
----+-----------------
251+
1 | rowmarks.second
252+
1 | rowmarks.second
253+
(2 rows)
254+
255+
/* Check deletes (plan) */
256+
EXPLAIN (COSTS OFF)
257+
DELETE FROM rowmarks.second
258+
WHERE rowmarks.second.id IN (SELECT id FROM rowmarks.first WHERE id = 1);
259+
QUERY PLAN
260+
---------------------------------------------
261+
Delete on second
262+
-> Nested Loop Semi Join
263+
-> Seq Scan on second
264+
Filter: (id = 1)
265+
-> Materialize
266+
-> Append
267+
-> Seq Scan on first_0
268+
Filter: (id = 1)
269+
(8 rows)
270+
271+
EXPLAIN (COSTS OFF)
272+
DELETE FROM rowmarks.second
273+
WHERE rowmarks.second.id IN (SELECT id FROM rowmarks.first WHERE id < 1);
274+
QUERY PLAN
275+
---------------------------------------------------
276+
Delete on second
277+
-> Hash Join
278+
Hash Cond: (second.id = first_0.id)
279+
-> Seq Scan on second
280+
-> Hash
281+
-> HashAggregate
282+
Group Key: first_0.id
283+
-> Append
284+
-> Seq Scan on first_0
285+
Filter: (id < 1)
286+
-> Seq Scan on first_1
287+
Filter: (id < 1)
288+
-> Seq Scan on first_2
289+
Filter: (id < 1)
290+
-> Seq Scan on first_3
291+
Filter: (id < 1)
292+
-> Seq Scan on first_4
293+
Filter: (id < 1)
294+
(18 rows)
295+
296+
EXPLAIN (COSTS OFF)
297+
DELETE FROM rowmarks.second
298+
WHERE rowmarks.second.id IN (SELECT id FROM rowmarks.first WHERE id = 1 OR id = 2);
299+
QUERY PLAN
300+
---------------------------------------------
301+
Delete on second
302+
-> Hash Semi Join
303+
Hash Cond: (second.id = first_0.id)
304+
-> Seq Scan on second
305+
-> Hash
306+
-> Append
307+
-> Seq Scan on first_0
308+
Filter: (id = 1)
309+
-> Seq Scan on first_1
310+
Filter: (id = 2)
311+
(10 rows)
312+
171313
DROP SCHEMA rowmarks CASCADE;
172314
NOTICE: drop cascades to 7 other objects
173315
DETAIL: drop cascades to table rowmarks.first

‎sql/pathman_rowmarks.sql

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
CREATE EXTENSION pg_pathman;
22
CREATE SCHEMA rowmarks;
33

4+
5+
46
CREATE TABLE rowmarks.first(id int NOT NULL);
57
CREATE TABLE rowmarks.second(id int NOT NULL);
68

@@ -56,6 +58,38 @@ WHERE id = (SELECT id FROM rowmarks.second
5658
FOR UPDATE)
5759
FOR SHARE;
5860

61+
/* Check updates (plan) */
62+
EXPLAIN (COSTS OFF)
63+
UPDATE rowmarks.second SET id = 2
64+
WHERE rowmarks.second.id IN (SELECT id FROM rowmarks.first WHERE id = 1);
65+
EXPLAIN (COSTS OFF)
66+
UPDATE rowmarks.second SET id = 2
67+
WHERE rowmarks.second.id IN (SELECT id FROM rowmarks.first WHERE id < 1);
68+
EXPLAIN (COSTS OFF)
69+
UPDATE rowmarks.second SET id = 2
70+
WHERE rowmarks.second.id IN (SELECT id FROM rowmarks.first WHERE id = 1 OR id = 2);
71+
EXPLAIN (COSTS OFF)
72+
UPDATE rowmarks.second SET id = 2
73+
WHERE rowmarks.second.id IN (SELECT id FROM rowmarks.first WHERE id = 1)
74+
RETURNING *, tableoid::regclass;
75+
76+
/* Check updates (execution) */
77+
UPDATE rowmarks.second SET id = 1
78+
WHERE rowmarks.second.id IN (SELECT id FROM rowmarks.first WHERE id = 1 OR id = 2)
79+
RETURNING *, tableoid::regclass;
80+
81+
/* Check deletes (plan) */
82+
EXPLAIN (COSTS OFF)
83+
DELETE FROM rowmarks.second
84+
WHERE rowmarks.second.id IN (SELECT id FROM rowmarks.first WHERE id = 1);
85+
EXPLAIN (COSTS OFF)
86+
DELETE FROM rowmarks.second
87+
WHERE rowmarks.second.id IN (SELECT id FROM rowmarks.first WHERE id < 1);
88+
EXPLAIN (COSTS OFF)
89+
DELETE FROM rowmarks.second
90+
WHERE rowmarks.second.id IN (SELECT id FROM rowmarks.first WHERE id = 1 OR id = 2);
91+
92+
5993

6094
DROP SCHEMA rowmarks CASCADE;
6195
DROP EXTENSION pg_pathman;

‎src/compat/rowmarks_fix.c

Lines changed: 18 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -14,165 +14,39 @@
1414

1515
#include "access/sysattr.h"
1616
#include "catalog/pg_type.h"
17-
#include "nodes/relation.h"
1817
#include "nodes/nodeFuncs.h"
18+
#include "optimizer/planmain.h"
1919
#include "utils/builtins.h"
2020
#include "utils/rel.h"
2121

2222

2323
#ifndef NATIVE_PARTITIONING_ROWMARKS
2424

25-
/* Special column name for rowmarks */
26-
#define TABLEOID_STR(subst) ( "pathman_tableoid" subst )
27-
#define TABLEOID_STR_BASE_LEN ( sizeof(TABLEOID_STR("")) - 1 )
2825

29-
30-
static void lock_rows_visitor(Plan *plan, void *context);
31-
static List *get_tableoids_list(List *tlist);
32-
33-
34-
/* Final rowmark processing for partitioned tables */
3526
void
36-
postprocess_lock_rows(List *rtable, Plan *plan)
37-
{
38-
plan_tree_walker(plan, lock_rows_visitor, rtable);
39-
}
40-
41-
/*
42-
* Add missing 'TABLEOID_STR%u' junk attributes for inherited partitions
43-
*
44-
* This is necessary since preprocess_targetlist() heavily
45-
* depends on the 'inh' flag which we have to unset.
46-
*
47-
* postprocess_lock_rows() will later transform 'TABLEOID_STR:Oid'
48-
* relnames into 'tableoid:rowmarkId'.
49-
*/
50-
void
51-
rowmark_add_tableoids(Query *parse)
52-
{
53-
ListCell *lc;
54-
55-
/* Generate 'tableoid' for partitioned table rowmark */
56-
foreach (lc, parse->rowMarks)
57-
{
58-
RowMarkClause *rc = (RowMarkClause *) lfirst(lc);
59-
Oid parent = getrelid(rc->rti, parse->rtable);
60-
Var *var;
61-
TargetEntry *tle;
62-
char resname[64];
63-
64-
/* Check that table is partitioned */
65-
if (!get_pathman_relation_info(parent))
66-
continue;
67-
68-
var = makeVar(rc->rti,
69-
TableOidAttributeNumber,
70-
OIDOID,
71-
-1,
72-
InvalidOid,
73-
0);
74-
75-
/* Use parent's Oid as TABLEOID_STR's key (%u) */
76-
snprintf(resname, sizeof(resname), TABLEOID_STR("%u"), parent);
77-
78-
tle = makeTargetEntry((Expr *) var,
79-
list_length(parse->targetList) + 1,
80-
pstrdup(resname),
81-
true);
82-
83-
/* There's no problem here since new attribute is junk */
84-
parse->targetList = lappend(parse->targetList, tle);
85-
}
86-
}
87-
88-
/*
89-
* Extract target entries with resnames beginning with TABLEOID_STR
90-
* and var->varoattno == TableOidAttributeNumber
91-
*/
92-
static List *
93-
get_tableoids_list(List *tlist)
27+
append_tle_for_rowmark(PlannerInfo *root, PlanRowMark *rc)
9428
{
95-
List *result = NIL;
96-
ListCell *lc;
97-
98-
foreach (lc, tlist)
99-
{
100-
TargetEntry *te = (TargetEntry *) lfirst(lc);
101-
Var *var = (Var *) te->expr;
102-
103-
if (!IsA(var, Var))
104-
continue;
105-
106-
/* Check that column name begins with TABLEOID_STR & it's tableoid */
107-
if (var->varoattno == TableOidAttributeNumber &&
108-
(te->resname && strlen(te->resname) > TABLEOID_STR_BASE_LEN) &&
109-
0 == strncmp(te->resname, TABLEOID_STR(""), TABLEOID_STR_BASE_LEN))
110-
{
111-
result = lappend(result, te);
112-
}
113-
}
114-
115-
return result;
116-
}
117-
118-
/*
119-
* Find 'TABLEOID_STR%u' attributes that were manually
120-
* created for partitioned tables and replace Oids
121-
* (used for '%u') with expected rc->rowmarkIds
122-
*/
123-
static void
124-
lock_rows_visitor(Plan *plan, void *context)
125-
{
126-
List *rtable = (List *) context;
127-
LockRows *lock_rows = (LockRows *) plan;
128-
Plan *lock_child = outerPlan(plan);
129-
List *tableoids;
130-
ListCell *lc;
131-
132-
if (!IsA(lock_rows, LockRows))
133-
return;
134-
135-
Assert(rtable && IsA(rtable, List) && lock_child);
136-
137-
/* Select tableoid attributes that must be renamed */
138-
tableoids = get_tableoids_list(lock_child->targetlist);
139-
if (!tableoids)
140-
return; /* this LockRows has nothing to do with partitioned table */
141-
142-
foreach (lc, lock_rows->rowMarks)
143-
{
144-
PlanRowMark *rc = (PlanRowMark *) lfirst(lc);
145-
Oid parent_oid = getrelid(rc->rti, rtable);
146-
ListCell *mark_lc;
147-
List *finished_tes = NIL; /* postprocessed target entries */
148-
149-
foreach (mark_lc, tableoids)
150-
{
151-
TargetEntry *te = (TargetEntry *) lfirst(mark_lc);
152-
const char *cur_oid_str = &(te->resname[TABLEOID_STR_BASE_LEN]);
153-
Datum cur_oid_datum;
154-
155-
cur_oid_datum = DirectFunctionCall1(oidin, CStringGetDatum(cur_oid_str));
29+
Var *var;
30+
char resname[32];
31+
TargetEntry *tle;
15632

157-
if (DatumGetObjectId(cur_oid_datum) == parent_oid)
158-
{
159-
char resname[64];
33+
var = makeVar(rc->rti,
34+
TableOidAttributeNumber,
35+
OIDOID,
36+
-1,
37+
InvalidOid,
38+
0);
16039

161-
/* Replace 'TABLEOID_STR:Oid' with 'tableoid:rowmarkId' */
162-
snprintf(resname, sizeof(resname), "tableoid%u", rc->rowmarkId);
163-
te->resname = pstrdup(resname);
40+
snprintf(resname, sizeof(resname), "tableoid%u", rc->rowmarkId);
16441

165-
finished_tes = lappend(finished_tes, te);
166-
}
167-
}
42+
tle = makeTargetEntry((Expr *) var,
43+
list_length(root->processed_tlist) + 1,
44+
pstrdup(resname),
45+
true);
16846

169-
/* Remove target entries that have been processed in this step */
170-
foreach (mark_lc, finished_tes)
171-
tableoids = list_delete_ptr(tableoids, lfirst(mark_lc));
47+
root->processed_tlist = lappend(root->processed_tlist, tle);
17248

173-
if (list_length(tableoids) == 0)
174-
break; /* nothing to do */
175-
}
49+
add_vars_to_targetlist(root, list_make1(var), bms_make_singleton(0), true);
17650
}
17751

17852
#endif /* NATIVE_PARTITIONING_ROWMARKS */

‎src/hooks.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -276,13 +276,6 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
276276
root->parse->resultRelation == rti)
277277
return;
278278

279-
/* It's better to exit, since RowMarks might be broken (hook aims to fix them) */
280-
#ifndef NATIVE_EXPAND_RTE_HOOK
281-
if (root->parse->commandType != CMD_SELECT &&
282-
root->parse->commandType != CMD_INSERT)
283-
return;
284-
#endif
285-
286279
/* Skip if this table is not allowed to act as parent (e.g. FROM ONLY) */
287280
if (PARENTHOOD_DISALLOWED == get_rel_parenthood_status(root->parse->queryId, rte))
288281
return;
@@ -545,9 +538,6 @@ pathman_planner_hook(Query *parse, int cursorOptions, ParamListInfo boundParams)
545538

546539
if (pathman_ready)
547540
{
548-
/* Give rowmark-related attributes correct names */
549-
ExecuteForPlanTree(result, postprocess_lock_rows);
550-
551541
/* Add PartitionFilter node for INSERT queries */
552542
ExecuteForPlanTree(result, add_partition_filters);
553543

‎src/include/compat/rowmarks_fix.h

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "postgres.h"
1919
#include "nodes/parsenodes.h"
2020
#include "nodes/plannodes.h"
21+
#include "nodes/relation.h"
2122

2223

2324
/*
@@ -31,12 +32,14 @@
3132
#endif
3233

3334

34-
#ifdef NATIVE_PARTITIONING_ROWMARKS
35-
#define postprocess_lock_rows(rtable, plan) ( (void) true )
36-
#define rowmark_add_tableoids(parse) ( (void) true )
35+
#ifndef NATIVE_PARTITIONING_ROWMARKS
36+
37+
void append_tle_for_rowmark(PlannerInfo *root, PlanRowMark *rc);
38+
3739
#else
38-
void postprocess_lock_rows(List *rtable, Plan *plan);
39-
void rowmark_add_tableoids(Query *parse);
40+
41+
#define append_tle_for_rowmark(root, rc) ( (void) true )
42+
4043
#endif /* NATIVE_PARTITIONING_ROWMARKS */
4144

4245

‎src/pg_pathman.c

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#include "compat/expand_rte_hook.h"
1313
#include "compat/pg_compat.h"
14+
#include "compat/rowmarks_fix.h"
1415

1516
#include "init.h"
1617
#include "hooks.h"
@@ -410,6 +411,37 @@ append_child_relation(PlannerInfo *root, Relation parent_relation,
410411
root->total_table_pages += (double) child_rel->pages;
411412

412413

414+
/* Create rowmarks required for child rels */
415+
parent_rowmark = get_plan_rowmark(root->rowMarks, parent_rti);
416+
if (parent_rowmark)
417+
{
418+
child_rowmark = makeNode(PlanRowMark);
419+
420+
child_rowmark->rti = childRTindex;
421+
child_rowmark->prti = parent_rti;
422+
child_rowmark->rowmarkId = parent_rowmark->rowmarkId;
423+
/* Reselect rowmark type, because relkind might not match parent */
424+
child_rowmark->markType = select_rowmark_type(child_rte,
425+
parent_rowmark->strength);
426+
child_rowmark->allMarkTypes = (1 << child_rowmark->markType);
427+
child_rowmark->strength = parent_rowmark->strength;
428+
child_rowmark->waitPolicy = parent_rowmark->waitPolicy;
429+
child_rowmark->isParent = false;
430+
431+
root->rowMarks = lappend(root->rowMarks, child_rowmark);
432+
433+
/* Adjust tlist for RowMarks (see planner.c) */
434+
if (!parent_rowmark->isParent && !root->parse->setOperations)
435+
{
436+
append_tle_for_rowmark(root, parent_rowmark);
437+
}
438+
439+
/* Include child's rowmark type in parent's allMarkTypes */
440+
parent_rowmark->allMarkTypes |= child_rowmark->allMarkTypes;
441+
parent_rowmark->isParent = true;
442+
}
443+
444+
413445
/* Build an AppendRelInfo for this child */
414446
appinfo = makeNode(AppendRelInfo);
415447
appinfo->parent_relid = parent_rti;
@@ -519,31 +551,6 @@ append_child_relation(PlannerInfo *root, Relation parent_relation,
519551
/* Close child relations, but keep locks */
520552
heap_close(child_relation, NoLock);
521553

522-
523-
/* Create rowmarks required for child rels */
524-
parent_rowmark = get_plan_rowmark(root->rowMarks, parent_rti);
525-
if (parent_rowmark)
526-
{
527-
child_rowmark = makeNode(PlanRowMark);
528-
529-
child_rowmark->rti = childRTindex;
530-
child_rowmark->prti = parent_rti;
531-
child_rowmark->rowmarkId = parent_rowmark->rowmarkId;
532-
/* Reselect rowmark type, because relkind might not match parent */
533-
child_rowmark->markType = select_rowmark_type(child_rte,
534-
parent_rowmark->strength);
535-
child_rowmark->allMarkTypes = (1 << child_rowmark->markType);
536-
child_rowmark->strength = parent_rowmark->strength;
537-
child_rowmark->waitPolicy = parent_rowmark->waitPolicy;
538-
child_rowmark->isParent = false;
539-
540-
root->rowMarks = lappend(root->rowMarks, child_rowmark);
541-
542-
/* Include child's rowmark type in parent's allMarkTypes */
543-
parent_rowmark->allMarkTypes |= child_rowmark->allMarkTypes;
544-
parent_rowmark->isParent = true;
545-
}
546-
547554
return childRTindex;
548555
}
549556

‎src/planner_tree_modification.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ pathman_transform_query_walker(Node *node, void *context)
158158
assign_query_id(query);
159159

160160
/* Apply Query tree modifiers */
161-
rowmark_add_tableoids(query);
162161
disable_standard_inheritance(query);
163162
handle_modification_query(query, (ParamListInfo) context);
164163

0 commit comments

Comments
 (0)
Please sign in to comment.