Skip to content

Commit 9f1001e

Browse files
danolivodanolivo
committed
Cumulative commit induced by regression tests results.
1. Do learn data writings into service relations after the query end. But for the full solution of invalidation messages infinity loop problem we need to save all aqo data in a memory cache. Flushing the data into the disk need to do at separate transaction. 2. Fix the bug than aqo modifies path_relids and path_clauses node fields during learning. It was induced segfaults in the case, than the plan was stored into the plancache. 3. Now AQO add state info to EXPLAIN message in verbose mode only. 4. QueryContext was introduced. Now all the query-related aqo data links to the query by query environment machinery. It is solves a learning problem if subqueries induced by top-level query. 5. Exclude 'SET STORAGE MAIN' definition for some columns of the aqo service relations. It is made for regression test passing and may be reverted. 6. AQO tests are modified. 7. Suppress AQO in parallel mode. We made it because AQO writes data into service relations during a parallel stage and break command counter synchronization.
1 parent 1a2bec2 commit 9f1001e

14 files changed

+198
-111
lines changed

‎aqo--1.0.sql

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,6 @@ CREATE INDEX aqo_query_texts_query_hash_idx ON public.aqo_query_texts (query_has
4040
CREATE INDEX aqo_query_stat_idx ON public.aqo_query_stat (query_hash);
4141
CREATE INDEX aqo_fss_access_idx ON public.aqo_data (fspace_hash, fsspace_hash);
4242

43-
ALTER TABLE public.aqo_data ALTER COLUMN features SET STORAGE MAIN;
44-
ALTER TABLE public.aqo_data ALTER COLUMN targets SET STORAGE MAIN;
45-
ALTER TABLE public.aqo_query_stat
46-
ALTER COLUMN execution_time_with_aqo SET STORAGE MAIN;
47-
ALTER TABLE public.aqo_query_stat
48-
ALTER COLUMN execution_time_without_aqo SET STORAGE MAIN;
49-
ALTER TABLE public.aqo_query_stat
50-
ALTER COLUMN planning_time_with_aqo SET STORAGE MAIN;
51-
ALTER TABLE public.aqo_query_stat
52-
ALTER COLUMN planning_time_without_aqo SET STORAGE MAIN;
53-
ALTER TABLE public.aqo_query_stat
54-
ALTER COLUMN cardinality_error_without_aqo SET STORAGE MAIN;
55-
ALTER TABLE public.aqo_query_stat
56-
ALTER COLUMN cardinality_error_with_aqo SET STORAGE MAIN;
57-
5843
INSERT INTO public.aqo_queries VALUES (0, false, false, 0, false);
5944
INSERT INTO public.aqo_query_texts VALUES (0, 'COMMON feature space (do not delete!)');
6045
-- a virtual query for COMMON feature space

‎aqo.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ double log_selectivity_lower_bound = -30;
3939
* Currently we use it only to store query_text string which is initialized
4040
* after a query parsing and is used during the query planning.
4141
*/
42-
MemoryContext AQOMemoryContext;
43-
QueryContextData query_context;
42+
MemoryContext AQOMemoryContext;
43+
QueryContextData query_context;
44+
char *query_text = NULL;
4445

4546
/* Saved hook values */
4647
post_parse_analyze_hook_type prev_post_parse_analyze_hook;

‎aqo.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ extern double log_selectivity_lower_bound;
222222

223223
/* Parameters for current query */
224224
extern QueryContextData query_context;
225+
extern char *query_text;
225226

226227
/* Memory context for long-live data */
227228
extern MemoryContext AQOMemoryContext;

‎expected/aqo_controlled.out

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,7 @@ WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
199199
Index Scan using aqo_test0_idx_a on aqo_test0
200200
Index Cond: (a < 3)
201201
Filter: ((b < 3) AND (c < 3) AND (d < 3))
202-
Using aqo: true
203-
(4 rows)
202+
(3 rows)
204203

205204
EXPLAIN (COSTS FALSE)
206205
SELECT * FROM aqo_test0
@@ -210,8 +209,7 @@ WHERE a < 5 AND b < 5 AND c < 5 AND d < 5;
210209
Index Scan using aqo_test0_idx_a on aqo_test0
211210
Index Cond: (a < 5)
212211
Filter: ((b < 5) AND (c < 5) AND (d < 5))
213-
Using aqo: true
214-
(4 rows)
212+
(3 rows)
215213

216214
EXPLAIN (COSTS FALSE)
217215
SELECT t1.a, t2.b FROM aqo_test0 AS t1, aqo_test0 AS t2
@@ -224,8 +222,7 @@ WHERE t1.a < 1 AND t1.b < 1 AND t2.c < 1 AND t2.d < 1;
224222
Filter: (b < 1)
225223
-> Seq Scan on aqo_test0 t2
226224
Filter: ((c < 1) AND (d < 1))
227-
Using aqo: true
228-
(7 rows)
225+
(6 rows)
229226

230227
EXPLAIN (COSTS FALSE)
231228
SELECT t1.a, t2.b FROM aqo_test1 AS t1, aqo_test0 AS t2
@@ -256,8 +253,7 @@ WHERE t1.a < 1 AND t3.b < 1 AND t2.c < 1 AND t3.d < 0 AND t1.a = t2.a AND t1.b =
256253
Filter: (c < 1)
257254
-> Seq Scan on aqo_test0 t3
258255
Filter: ((b < 1) AND (d < 0))
259-
Using aqo: true
260-
(11 rows)
256+
(10 rows)
261257

262258
EXPLAIN (COSTS FALSE)
263259
SELECT t1.a AS a, t2.a AS b, t3.a AS c
@@ -274,8 +270,7 @@ WHERE t1.a = t2.b AND t2.a = t3.b;
274270
-> Seq Scan on aqo_test1 t2
275271
-> Hash
276272
-> Seq Scan on aqo_test1 t3
277-
Using aqo: true
278-
(10 rows)
273+
(9 rows)
279274

280275
EXPLAIN (COSTS FALSE)
281276
SELECT t1.a AS a, t2.a AS b, t3.a AS c

‎expected/aqo_disabled.out

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
9292
Index Scan using aqo_test0_idx_a on aqo_test0 (cost=0.28..8.35 rows=3 width=16)
9393
Index Cond: (a < 3)
9494
Filter: ((b < 3) AND (c < 3) AND (d < 3))
95-
Using aqo: true
96-
(4 rows)
95+
(3 rows)
9796

9897
EXPLAIN SELECT t1.a, t2.b, t3.c
9998
FROM aqo_test1 AS t1, aqo_test0 AS t2, aqo_test0 AS t3
@@ -110,8 +109,7 @@ WHERE t1.a < 1 AND t3.b < 1 AND t2.c < 1 AND t3.d < 0 AND t1.a = t2.a AND t1.b =
110109
Filter: (c < 1)
111110
-> Seq Scan on aqo_test0 t3 (cost=0.00..41.02 rows=1 width=8)
112111
Filter: ((b < 1) AND (d < 0))
113-
Using aqo: true
114-
(11 rows)
112+
(10 rows)
115113

116114
SET aqo.mode = 'disabled';
117115
EXPLAIN SELECT * FROM aqo_test0

‎expected/aqo_forced.out

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
6565
Index Scan using aqo_test0_idx_a on aqo_test0
6666
Index Cond: (a < 3)
6767
Filter: ((b < 3) AND (c < 3) AND (d < 3))
68-
Using aqo: true
69-
(4 rows)
68+
(3 rows)
7069

7170
EXPLAIN (COSTS FALSE)
7271
SELECT * FROM aqo_test0
@@ -76,8 +75,7 @@ WHERE a < 5 AND b < 5 AND c < 5 AND d < 5;
7675
Index Scan using aqo_test0_idx_a on aqo_test0
7776
Index Cond: (a < 5)
7877
Filter: ((b < 5) AND (c < 5) AND (d < 5))
79-
Using aqo: true
80-
(4 rows)
78+
(3 rows)
8179

8280
DROP INDEX aqo_test0_idx_a;
8381
DROP TABLE aqo_test0;

‎expected/aqo_intelligent.out

Lines changed: 38 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,7 @@ WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
410410
Index Scan using aqo_test0_idx_a on aqo_test0 (cost=0.28..8.35 rows=3 width=16)
411411
Index Cond: (a < 3)
412412
Filter: ((b < 3) AND (c < 3) AND (d < 3))
413-
Using aqo: true
414-
(4 rows)
413+
(3 rows)
415414

416415
EXPLAIN SELECT * FROM aqo_test0
417416
WHERE a < 4 AND b < 4 AND c < 4 AND d < 4;
@@ -420,8 +419,7 @@ WHERE a < 4 AND b < 4 AND c < 4 AND d < 4;
420419
Index Scan using aqo_test0_idx_a on aqo_test0 (cost=0.28..8.38 rows=4 width=16)
421420
Index Cond: (a < 4)
422421
Filter: ((b < 4) AND (c < 4) AND (d < 4))
423-
Using aqo: true
424-
(4 rows)
422+
(3 rows)
425423

426424
EXPLAIN SELECT * FROM aqo_test0
427425
WHERE a < 5 AND b < 5 AND c < 5 AND d < 5;
@@ -430,8 +428,7 @@ WHERE a < 5 AND b < 5 AND c < 5 AND d < 5;
430428
Index Scan using aqo_test0_idx_a on aqo_test0 (cost=0.28..8.40 rows=5 width=16)
431429
Index Cond: (a < 5)
432430
Filter: ((b < 5) AND (c < 5) AND (d < 5))
433-
Using aqo: true
434-
(4 rows)
431+
(3 rows)
435432

436433
EXPLAIN SELECT t1.a, t2.b FROM aqo_test0 AS t1, aqo_test0 AS t2
437434
WHERE t1.a < 1 AND t1.b < 1 AND t2.c < 1 AND t2.d < 1;
@@ -443,8 +440,7 @@ WHERE t1.a < 1 AND t1.b < 1 AND t2.c < 1 AND t2.d < 1;
443440
Filter: (b < 1)
444441
-> Seq Scan on aqo_test0 t2 (cost=0.00..41.02 rows=1 width=4)
445442
Filter: ((c < 1) AND (d < 1))
446-
Using aqo: true
447-
(7 rows)
443+
(6 rows)
448444

449445
EXPLAIN SELECT t1.a, t2.b FROM aqo_test1 AS t1, aqo_test0 AS t2
450446
WHERE t1.a < 1 AND t2.b < 1 AND t2.c < 1 AND t2.d < 1 AND t1.a = t2.a;
@@ -456,8 +452,7 @@ WHERE t1.a < 1 AND t2.b < 1 AND t2.c < 1 AND t2.d < 1 AND t1.a = t2.a;
456452
-> Index Scan using aqo_test0_idx_a on aqo_test0 t2 (cost=0.28..8.30 rows=1 width=8)
457453
Index Cond: (a = t1.a)
458454
Filter: ((b < 1) AND (c < 1) AND (d < 1))
459-
Using aqo: true
460-
(7 rows)
455+
(6 rows)
461456

462457
EXPlAIN SELECT t1.a, t2.b, t3.c
463458
FROM aqo_test1 AS t1, aqo_test0 AS t2, aqo_test0 AS t3
@@ -474,8 +469,7 @@ WHERE t1.a < 1 AND t3.b < 1 AND t2.c < 1 AND t3.d < 0 AND t1.a = t2.a AND t1.b =
474469
Filter: (c < 1)
475470
-> Seq Scan on aqo_test0 t3 (cost=0.00..41.02 rows=1 width=8)
476471
Filter: ((b < 1) AND (d < 0))
477-
Using aqo: true
478-
(11 rows)
472+
(10 rows)
479473

480474
EXPLAIN SELECT t1.a AS a, t2.a AS b, t3.a AS c
481475
FROM aqo_test1 AS t1, aqo_test1 AS t2, aqo_test1 AS t3
@@ -491,8 +485,7 @@ WHERE t1.a = t2.b AND t2.a = t3.b;
491485
-> Seq Scan on aqo_test1 t2 (cost=0.00..1.20 rows=20 width=8)
492486
-> Hash (cost=1.20..1.20 rows=20 width=8)
493487
-> Seq Scan on aqo_test1 t3 (cost=0.00..1.20 rows=20 width=8)
494-
Using aqo: true
495-
(10 rows)
488+
(9 rows)
496489

497490
EXPLAIN SELECT t1.a AS a, t2.a AS b, t3.a AS c, t4.a AS d
498491
FROM aqo_test1 AS t1, aqo_test1 AS t2, aqo_test1 AS t3, aqo_test1 AS t4
@@ -512,8 +505,38 @@ WHERE t1.a = t2.b AND t2.a = t3.b AND t3.a = t4.b;
512505
-> Seq Scan on aqo_test1 t3 (cost=0.00..1.20 rows=20 width=8)
513506
-> Hash (cost=1.20..1.20 rows=20 width=8)
514507
-> Seq Scan on aqo_test1 t4 (cost=0.00..1.20 rows=20 width=8)
508+
(13 rows)
509+
510+
EXPLAIN verbose SELECT t1.a AS a, t2.a AS b, t3.a AS c, t4.a AS d
511+
FROM aqo_test1 AS t1, aqo_test1 AS t2, aqo_test1 AS t3, aqo_test1 AS t4
512+
WHERE t1.a = t2.b AND t2.a = t3.b AND t3.a = t4.b;
513+
QUERY PLAN
514+
--------------------------------------------------------------------------------------------
515+
Hash Join (cost=4.35..6.37 rows=20 width=16)
516+
Output: t1.a, t2.a, t3.a, t4.a
517+
Hash Cond: (t3.a = t4.b)
518+
-> Hash Join (cost=2.90..4.65 rows=20 width=12)
519+
Output: t1.a, t2.a, t3.a
520+
Hash Cond: (t2.a = t3.b)
521+
-> Hash Join (cost=1.45..2.92 rows=20 width=8)
522+
Output: t1.a, t2.a
523+
Hash Cond: (t1.a = t2.b)
524+
-> Seq Scan on public.aqo_test1 t1 (cost=0.00..1.20 rows=20 width=4)
525+
Output: t1.a, t1.b
526+
-> Hash (cost=1.20..1.20 rows=20 width=8)
527+
Output: t2.a, t2.b
528+
-> Seq Scan on public.aqo_test1 t2 (cost=0.00..1.20 rows=20 width=8)
529+
Output: t2.a, t2.b
530+
-> Hash (cost=1.20..1.20 rows=20 width=8)
531+
Output: t3.a, t3.b
532+
-> Seq Scan on public.aqo_test1 t3 (cost=0.00..1.20 rows=20 width=8)
533+
Output: t3.a, t3.b
534+
-> Hash (cost=1.20..1.20 rows=20 width=8)
535+
Output: t4.a, t4.b
536+
-> Seq Scan on public.aqo_test1 t4 (cost=0.00..1.20 rows=20 width=8)
537+
Output: t4.a, t4.b
515538
Using aqo: true
516-
(14 rows)
539+
(24 rows)
517540

518541
DROP INDEX aqo_test0_idx_a;
519542
DROP TABLE aqo_test0;

‎expected/aqo_learn.out

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,7 @@ WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
329329
Index Scan using aqo_test0_idx_a on aqo_test0 (cost=0.28..8.35 rows=3 width=16)
330330
Index Cond: (a < 3)
331331
Filter: ((b < 3) AND (c < 3) AND (d < 3))
332-
Using aqo: true
333-
(4 rows)
332+
(3 rows)
334333

335334
EXPLAIN SELECT * FROM aqo_test0
336335
WHERE a < 4 AND b < 4 AND c < 4 AND d < 4;
@@ -339,8 +338,7 @@ WHERE a < 4 AND b < 4 AND c < 4 AND d < 4;
339338
Index Scan using aqo_test0_idx_a on aqo_test0 (cost=0.28..8.38 rows=4 width=16)
340339
Index Cond: (a < 4)
341340
Filter: ((b < 4) AND (c < 4) AND (d < 4))
342-
Using aqo: true
343-
(4 rows)
341+
(3 rows)
344342

345343
EXPLAIN SELECT * FROM aqo_test0
346344
WHERE a < 5 AND b < 5 AND c < 5 AND d < 5;
@@ -349,8 +347,7 @@ WHERE a < 5 AND b < 5 AND c < 5 AND d < 5;
349347
Index Scan using aqo_test0_idx_a on aqo_test0 (cost=0.28..8.40 rows=5 width=16)
350348
Index Cond: (a < 5)
351349
Filter: ((b < 5) AND (c < 5) AND (d < 5))
352-
Using aqo: true
353-
(4 rows)
350+
(3 rows)
354351

355352
EXPLAIN SELECT t1.a, t2.b FROM aqo_test0 AS t1, aqo_test0 AS t2
356353
WHERE t1.a < 1 AND t1.b < 1 AND t2.c < 1 AND t2.d < 1;
@@ -362,8 +359,7 @@ WHERE t1.a < 1 AND t1.b < 1 AND t2.c < 1 AND t2.d < 1;
362359
Filter: (b < 1)
363360
-> Seq Scan on aqo_test0 t2 (cost=0.00..41.02 rows=1 width=4)
364361
Filter: ((c < 1) AND (d < 1))
365-
Using aqo: true
366-
(7 rows)
362+
(6 rows)
367363

368364
EXPLAIN SELECT t1.a, t2.b FROM aqo_test1 AS t1, aqo_test0 AS t2
369365
WHERE t1.a < 1 AND t2.b < 1 AND t2.c < 1 AND t2.d < 1 AND t1.a = t2.a;
@@ -375,8 +371,7 @@ WHERE t1.a < 1 AND t2.b < 1 AND t2.c < 1 AND t2.d < 1 AND t1.a = t2.a;
375371
-> Index Scan using aqo_test0_idx_a on aqo_test0 t2 (cost=0.28..8.30 rows=1 width=8)
376372
Index Cond: (a = t1.a)
377373
Filter: ((b < 1) AND (c < 1) AND (d < 1))
378-
Using aqo: true
379-
(7 rows)
374+
(6 rows)
380375

381376
EXPlAIN SELECT t1.a, t2.b, t3.c
382377
FROM aqo_test1 AS t1, aqo_test0 AS t2, aqo_test0 AS t3
@@ -393,8 +388,7 @@ WHERE t1.a < 1 AND t3.b < 1 AND t2.c < 1 AND t3.d < 0 AND t1.a = t2.a AND t1.b =
393388
Filter: (c < 1)
394389
-> Seq Scan on aqo_test0 t3 (cost=0.00..41.02 rows=1 width=8)
395390
Filter: ((b < 1) AND (d < 0))
396-
Using aqo: true
397-
(11 rows)
391+
(10 rows)
398392

399393
EXPLAIN SELECT t1.a AS a, t2.a AS b, t3.a AS c
400394
FROM aqo_test1 AS t1, aqo_test1 AS t2, aqo_test1 AS t3
@@ -410,8 +404,7 @@ WHERE t1.a = t2.b AND t2.a = t3.b;
410404
-> Seq Scan on aqo_test1 t2 (cost=0.00..1.20 rows=20 width=8)
411405
-> Hash (cost=1.20..1.20 rows=20 width=8)
412406
-> Seq Scan on aqo_test1 t3 (cost=0.00..1.20 rows=20 width=8)
413-
Using aqo: true
414-
(10 rows)
407+
(9 rows)
415408

416409
EXPLAIN SELECT t1.a AS a, t2.a AS b, t3.a AS c, t4.a AS d
417410
FROM aqo_test1 AS t1, aqo_test1 AS t2, aqo_test1 AS t3, aqo_test1 AS t4
@@ -431,8 +424,7 @@ WHERE t1.a = t2.b AND t2.a = t3.b AND t3.a = t4.b;
431424
-> Seq Scan on aqo_test1 t3 (cost=0.00..1.20 rows=20 width=8)
432425
-> Hash (cost=1.20..1.20 rows=20 width=8)
433426
-> Seq Scan on aqo_test1 t4 (cost=0.00..1.20 rows=20 width=8)
434-
Using aqo: true
435-
(14 rows)
427+
(13 rows)
436428

437429
DROP INDEX aqo_test0_idx_a;
438430
DROP TABLE aqo_test0;

‎expected/schema.out

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,26 @@ SELECT * FROM test;
2121
1 | string
2222
(1 row)
2323

24-
SELECT * FROM public.aqo_query_texts;
25-
query_hash | query_text
26-
------------+--------------------------------------------
27-
0 | COMMON feature space (do not delete!)
28-
1136691690 | INSERT INTO test (data) VALUES ('string');
29-
868705076 | SELECT * FROM test;
30-
826229959 | SELECT * FROM public.aqo_query_texts;
24+
-- Check AQO service relations state after some manipulations
25+
-- Exclude fields with hash values from the queries. Hash is depend on
26+
-- nodefuncs code which is highly PostgreSQL version specific.
27+
SELECT query_text FROM public.aqo_query_texts;
28+
query_text
29+
------------------------------------------------
30+
COMMON feature space (do not delete!)
31+
INSERT INTO test (data) VALUES ('string');
32+
SELECT * FROM test;
33+
SELECT query_text FROM public.aqo_query_texts;
3134
(4 rows)
3235

33-
SELECT * FROM public.aqo_queries;
34-
query_hash | learn_aqo | use_aqo | fspace_hash | auto_tuning
35-
------------+-----------+---------+-------------+-------------
36-
0 | f | f | 0 | f
37-
1136691690 | t | f | 1136691690 | t
38-
868705076 | t | f | 868705076 | t
39-
826229959 | t | f | 826229959 | t
40-
2145866904 | t | f | 2145866904 | t
36+
SELECT learn_aqo, use_aqo, auto_tuning FROM public.aqo_queries;
37+
learn_aqo | use_aqo | auto_tuning
38+
-----------+---------+-------------
39+
f | f | f
40+
t | f | t
41+
t | f | t
42+
t | f | t
43+
t | f | t
4144
(5 rows)
4245

4346
DROP SCHEMA IF EXISTS test1 CASCADE;

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy