database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

Improve EXPLAIN QUERY PLAN output and comments on bytecode listings by

Browse Source 
distinguishing between "subquery" and "join" and using consistent names
across EQP and bytecode.

FossilOrigin-Name: a2d3ee92420ec564e31eb0005367cf7ff3d00bfaed5a98ffdbe17c91c95d9d97
This commit is contained in:
drh
2022-04-22 17:36:10 +00:00
parent 67f70bea06
commit da653b897d
7 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/eqp.test
View File

@ -94,9 +94,9 @@ do_eqp_test 1.7.1 {
SELECT * FROM t3 JOIN (SELECT 1)
} {
QUERY PLAN
|--MATERIALIZE SUBQUERY xxxxxx
|--MATERIALIZE (subquery-xxxxxx)
| `--SCAN CONSTANT ROW
|--SCAN SUBQUERY xxxxxx
|--SCAN (subquery-xxxxxx)
`--SCAN t3
}
do_eqp_test 1.7.2 {
@ -123,13 +123,13 @@ do_eqp_test 1.8 {
SELECT * FROM t3 JOIN (SELECT 1 UNION SELECT 2)
} {
QUERY PLAN
|--MATERIALIZE SUBQUERY xxxxxx
|--MATERIALIZE (subquery-xxxxxx)
| `--COMPOUND QUERY
| |--LEFT-MOST SUBQUERY
| | `--SCAN CONSTANT ROW
| `--UNION USING TEMP B-TREE
| `--SCAN CONSTANT ROW
|--SCAN SUBQUERY xxxxxx
|--SCAN (subquery-xxxxxx)
`--SCAN t3
}
do_eqp_test 1.9 {
@ -282,10 +282,10 @@ det 3.2.1 {
SELECT * FROM (SELECT * FROM t1 ORDER BY x LIMIT 10) ORDER BY y LIMIT 5
} {
QUERY PLAN
|--CO-ROUTINE SUBQUERY xxxxxx
|--CO-ROUTINE (subquery-xxxxxx)
| |--SCAN t1
| `--USE TEMP B-TREE FOR ORDER BY
|--SCAN SUBQUERY xxxxxx
|--SCAN (subquery-xxxxxx)
`--USE TEMP B-TREE FOR ORDER BY
}
det 3.2.2 {

6
test/select1.test
View File

@ -545,14 +545,14 @@ do_test select1-6.9.7 {
set x [execsql2 {
SELECT * FROM test1 a, (select 5, 6) LIMIT 1
}]
regsub -all {subquery_[0-9a-fA-F_]+} $x {subquery} x
regsub -all {subquery-\d+} $x {subquery-0} x
set x
} {a.f1 11 a.f2 22 subquery.5 5 subquery.6 6}
} {a.f1 11 a.f2 22 (subquery-0).5 5 (subquery-0).6 6}
do_test select1-6.9.8 {
set x [execsql2 {
SELECT * FROM test1 a, (select 5 AS x, 6 AS y) AS b LIMIT 1
}]
regsub -all {subquery_[0-9a-fA-F]+_} $x {subquery} x
regsub -all {subquery-\d+} $x {subquery-0} x
set x
} {a.f1 11 a.f2 22 b.x 5 b.y 6}
do_test select1-6.9.9 {

1
test/tester.tcl
View File

@ -1011,6 +1011,7 @@ proc query_plan_graph {sql} {
append a [append_graph " " dx cx 0]
regsub -all { 0x[A-F0-9]+\y} $a { xxxxxx} a
regsub -all {(MATERIALIZE|CO-ROUTINE|SUBQUERY) \d+\y} $a {\1 xxxxxx} a
regsub -all {\((join|subquery)-\d+\)} $a {(\1-xxxxxx)} a
return $a
}