Skip to content

Commit 966c8a5

Browse files
ildusildus
committed
Fix invalidation
1 parent 6f7cf27 commit 966c8a5

File tree

9 files changed

+263
-237
lines changed

9 files changed

+263
-237
lines changed

‎expected/sr_plan.out‎

Lines changed: 44 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,97 @@
11
CREATE EXTENSION sr_plan;
2+
SET sr_plan.log_usage = NOTICE;
23
CREATE TABLE test_table(test_attr1 int, test_attr2 int);
4+
INSERT INTO test_table SELECT i, i + 1 FROM generate_series(1, 20) i;
35
SET sr_plan.write_mode = true;
46
SELECT * FROM test_table WHERE test_attr1 = _p(10);
7+
NOTICE: sr_plan: collected parameter on 44
8+
NOTICE: sr_plan: saved plan for SELECT * FROM test_table WHERE test_attr1 = _p(10);
59
test_attr1 | test_attr2
610
------------+------------
7-
(0 rows)
11+
10 | 11
12+
(1 row)
813

914
SELECT * FROM test_table WHERE test_attr1 = 10;
15+
NOTICE: sr_plan: saved plan for SELECT * FROM test_table WHERE test_attr1 = 10;
1016
test_attr1 | test_attr2
1117
------------+------------
12-
(0 rows)
18+
10 | 11
19+
(1 row)
1320

1421
SELECT * FROM test_table WHERE test_attr1 = 10;
1522
test_attr1 | test_attr2
1623
------------+------------
17-
(0 rows)
24+
10 | 11
25+
(1 row)
1826

1927
SET sr_plan.write_mode = false;
2028
SELECT * FROM test_table WHERE test_attr1 = _p(10);
29+
NOTICE: sr_plan: collected parameter on 44
2130
test_attr1 | test_attr2
2231
------------+------------
23-
(0 rows)
32+
10 | 11
33+
(1 row)
2434

2535
SELECT * FROM test_table WHERE test_attr1 = 10;
2636
test_attr1 | test_attr2
2737
------------+------------
28-
(0 rows)
38+
10 | 11
39+
(1 row)
2940

3041
SELECT * FROM test_table WHERE test_attr1 = 15;
3142
test_attr1 | test_attr2
3243
------------+------------
33-
(0 rows)
44+
15 | 16
45+
(1 row)
3446

3547
UPDATE sr_plans SET enable = true;
3648
SELECT * FROM test_table WHERE test_attr1 = _p(10);
49+
NOTICE: sr_plan: collected parameter on 44
50+
NOTICE: sr_plan: restored parameter on 44
51+
NOTICE: sr_plan: cached plan was used for query: SELECT * FROM test_table WHERE test_attr1 = _p(10);
3752
test_attr1 | test_attr2
3853
------------+------------
39-
(0 rows)
54+
10 | 11
55+
(1 row)
4056

4157
SELECT * FROM test_table WHERE test_attr1 = _p(15);
58+
NOTICE: sr_plan: collected parameter on 44
59+
NOTICE: sr_plan: restored parameter on 44
60+
NOTICE: sr_plan: cached plan was used for query: SELECT * FROM test_table WHERE test_attr1 = _p(15);
4261
test_attr1 | test_attr2
4362
------------+------------
44-
(0 rows)
63+
15 | 16
64+
(1 row)
4565

4666
SELECT * FROM test_table WHERE test_attr1 = 10;
67+
NOTICE: sr_plan: cached plan was used for query: SELECT * FROM test_table WHERE test_attr1 = 10;
4768
test_attr1 | test_attr2
4869
------------+------------
49-
(0 rows)
70+
10 | 11
71+
(1 row)
5072

5173
SELECT * FROM test_table WHERE test_attr1 = 15;
5274
test_attr1 | test_attr2
5375
------------+------------
54-
(0 rows)
55-
56-
SELECT enable, valid, query FROM sr_plans ORDER BY length(query);
57-
enable | valid | query
58-
--------+-------+-----------------------------------------------------
59-
t | t | SELECT * FROM test_table WHERE test_attr1 = 10;
60-
t | t | SELECT * FROM test_table WHERE test_attr1 = _p(10);
76+
15 | 16
77+
(1 row)
78+
79+
SELECT enable, query FROM sr_plans ORDER BY length(query);
80+
enable | query
81+
--------+-----------------------------------------------------
82+
t | SELECT * FROM test_table WHERE test_attr1 = 10;
83+
t | SELECT * FROM test_table WHERE test_attr1 = _p(10);
6184
(2 rows)
6285

6386
DROP TABLE test_table;
64-
SELECT enable, valid, query FROM sr_plans ORDER BY length(query);
65-
enable | valid | query
66-
--------+-------+-----------------------------------------------------
67-
t | f | SELECT * FROM test_table WHERE test_attr1 = 10;
68-
t | f | SELECT * FROM test_table WHERE test_attr1 = _p(10);
69-
(2 rows)
87+
SELECT enable, query FROM sr_plans ORDER BY length(query);
88+
enable | query
89+
--------+-------
90+
(0 rows)
7091

7192
CREATE TABLE test_table(test_attr1 int, test_attr2 int, test_attr3 int);
7293
SELECT * FROM test_table WHERE test_attr1 = _p(10);
94+
NOTICE: sr_plan: collected parameter on 44
7395
test_attr1 | test_attr2 | test_attr3
7496
------------+------------+------------
7597
(0 rows)

‎expected/sr_plan_schema.out‎

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,48 @@ SELECT * FROM test.test_table WHERE test_attr1 = 10;
2020

2121
SET sr_plan.write_mode = false;
2222
UPDATE plan.sr_plans SET enable = TRUE;
23-
SELECT enable, valid, query FROM plan.sr_plans ORDER BY length(query);
24-
enable | valid | query
25-
--------+-------+---------------------------------------------------------------
26-
t | t | SELECT * FROM test.test_table WHERE test_attr1 = 10;
27-
t | t | SELECT * FROM test.test_table WHERE test_attr1 = plan._p(10);
23+
SELECT enable, query FROM plan.sr_plans ORDER BY length(query);
24+
enable | query
25+
--------+---------------------------------------------------------------
26+
t | SELECT * FROM test.test_table WHERE test_attr1 = 10;
27+
t | SELECT * FROM test.test_table WHERE test_attr1 = plan._p(10);
2828
(2 rows)
2929

30-
DROP INDEX test.i1;
31-
SELECT enable, valid, query FROM plan.sr_plans ORDER BY length(query);
32-
enable | valid | query
33-
--------+-------+---------------------------------------------------------------
34-
t | f | SELECT * FROM test.test_table WHERE test_attr1 = 10;
35-
t | t | SELECT * FROM test.test_table WHERE test_attr1 = plan._p(10);
30+
EXPLAIN (COSTS OFF) SELECT * FROM test.test_table WHERE test_attr1 = plan._p(10);
31+
QUERY PLAN
32+
--------------------------------------
33+
Seq Scan on test_table
34+
Filter: (test_attr1 = plan._p(10))
3635
(2 rows)
3736

37+
EXPLAIN (COSTS OFF) SELECT * FROM test.test_table WHERE test_attr1 = 10;
38+
QUERY PLAN
39+
---------------------------------------
40+
Bitmap Heap Scan on test_table
41+
Recheck Cond: (test_attr1 = 10)
42+
-> Bitmap Index Scan on i1
43+
Index Cond: (test_attr1 = 10)
44+
(4 rows)
45+
46+
DROP INDEX test.i1;
47+
SELECT enable, query FROM plan.sr_plans ORDER BY length(query);
48+
enable | query
49+
--------+---------------------------------------------------------------
50+
t | SELECT * FROM test.test_table WHERE test_attr1 = plan._p(10);
51+
(1 row)
52+
3853
SELECT * FROM test.test_table WHERE test_attr1 = plan._p(10);
3954
test_attr1 | test_attr2
4055
------------+------------
4156
10 | 11
4257
(1 row)
4358

59+
SELECT * FROM test.test_table WHERE test_attr1 = plan._p(20);
60+
test_attr1 | test_attr2
61+
------------+------------
62+
20 | 21
63+
(1 row)
64+
4465
SELECT * FROM test.test_table WHERE test_attr1 = 10;
4566
test_attr1 | test_attr2
4667
------------+------------

‎init.sql‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ CREATE TABLE sr_plans (
99
query varchar NOT NULL,
1010
plan text NOT NULL,
1111
enable boolean NOT NULL,
12-
valid boolean NOT NULL,
13-
reloids oid[]
12+
13+
reloids oid[],
14+
index_reloids oid[]
1415
);
1516

1617
CREATE INDEX sr_plans_query_hash_idx ON sr_plans (query_hash);
1718
CREATE INDEX sr_plans_query_oids ON sr_plans USING gin(reloids);
19+
CREATE INDEX sr_plans_query_index_oids ON sr_plans USING gin(index_reloids);
1820

1921
CREATE FUNCTION _p(anyelement)
2022
RETURNS anyelement
@@ -31,16 +33,10 @@ BEGIN
3133
WHERE object_type = 'table' OR object_type = 'index'
3234
LOOP
3335
IF obj.object_type = 'table' THEN
34-
EXECUTE 'DELETE FROM sr_plans WHERE reloids @> ARRAY[$1]'
35-
USING obj.objid;
36+
DELETE FROM @[email protected]_plans WHERE reloids @> ARRAY[obj.objid];
3637
ELSE
3738
IF obj.object_type = 'index' THEN
38-
FOR indobj IN SELECT indrelid FROM pg_index
39-
WHERE indexrelid = obj.objid
40-
LOOP
41-
EXECUTE 'DELETE FROM sr_plans WHERE reloids @> ARRAY[$1]'
42-
USING indobj.indrelid;
43-
END LOOP;
39+
DELETE FROM @[email protected]_plans WHERE index_reloids @> ARRAY[obj.objid];
4440
END IF;
4541
END IF;
4642
END LOOP;

‎sql/sr_plan.sql‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ CREATE EXTENSION sr_plan;
22

33
SET sr_plan.log_usage = NOTICE;
44
CREATE TABLE test_table(test_attr1 int, test_attr2 int);
5+
INSERT INTO test_table SELECT i, i + 1 FROM generate_series(1, 20) i;
56
SET sr_plan.write_mode = true;
67
SELECT * FROM test_table WHERE test_attr1 = _p(10);
78
SELECT * FROM test_table WHERE test_attr1 = 10;
@@ -19,9 +20,9 @@ SELECT * FROM test_table WHERE test_attr1 = _p(15);
1920
SELECT * FROM test_table WHERE test_attr1 = 10;
2021
SELECT * FROM test_table WHERE test_attr1 = 15;
2122

22-
SELECT enable, valid, query FROM sr_plans ORDER BY length(query);
23+
SELECT enable, query FROM sr_plans ORDER BY length(query);
2324
DROP TABLE test_table;
24-
SELECT enable, valid, query FROM sr_plans ORDER BY length(query);
25+
SELECT enable, query FROM sr_plans ORDER BY length(query);
2526

2627
CREATE TABLE test_table(test_attr1 int, test_attr2 int, test_attr3 int);
2728

‎sql/sr_plan_schema.sql‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@ SET sr_plan.write_mode = false;
1414

1515
UPDATE plan.sr_plans SET enable = TRUE;
1616

17-
SELECT enable, valid, query FROM plan.sr_plans ORDER BY length(query);
17+
SELECT enable, query FROM plan.sr_plans ORDER BY length(query);
18+
EXPLAIN (COSTS OFF) SELECT * FROM test.test_table WHERE test_attr1 = plan._p(10);
19+
EXPLAIN (COSTS OFF) SELECT * FROM test.test_table WHERE test_attr1 = 10;
20+
1821
DROP INDEX test.i1;
19-
SELECT enable, valid, query FROM plan.sr_plans ORDER BY length(query);
22+
SELECT enable, query FROM plan.sr_plans ORDER BY length(query);
2023

2124
SELECT * FROM test.test_table WHERE test_attr1 = plan._p(10);
25+
SELECT * FROM test.test_table WHERE test_attr1 = plan._p(20);
2226
SELECT * FROM test.test_table WHERE test_attr1 = 10;
2327

2428
DROP SCHEMA plan CASCADE;

‎sr_plan--1.0--1.1.sql‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ CREATE TABLE sr_plans (
55
query varchar NOT NULL,
66
plan text NOT NULL,
77
enable boolean NOT NULL,
8-
valid boolean NOT NULL,
9-
reloids oid[]
8+
9+
reloids oid[],
10+
index_reloids oid[]
1011
);
1112

1213
CREATE INDEX sr_plans_query_hash_idx ON sr_plans (query_hash);
1314
CREATE INDEX sr_plans_query_oids ON sr_plans USING gin(reloids);
15+
CREATE INDEX sr_plans_query_index_oids ON sr_plans USING gin(index_reloids);
1416

1517
DROP FUNCTION explain_jsonb_plan(jsonb) CASCADE;
1618
DROP FUNCTION sr_plan_invalid_table() CASCADE;

0 commit comments

Comments
 (0)