From 30969d3f26c3585a3b9404de1bc81b9d0e9fa813 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 11 Nov 2010 17:48:51 +0000 Subject: [PATCH] Use "COMPOUND" instead of "COMPOSITE" in the EXPLAIN QUERY PLAN output to describe UNION, UNION ALL, EXCEPT and INTERSECT operations. FossilOrigin-Name: 28643b85d93d27a44b9370e4087efa8fa2af7f8e --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/select.c | 2 +- test/eqp.test | 28 ++++++++++++++-------------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/manifest b/manifest index 38c37d760a..8a80193603 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sa\srow\sof\sEXPLAIN\sQUERY\sPLAN\soutput\sfor\seach\scomposite\sselect\soperation\s(UNION,\sEXCEPT\setc.)\sin\sthe\squery. -D 2010-11-11T16:46:40 +C Use\s"COMPOUND"\sinstead\sof\s"COMPOSITE"\sin\sthe\sEXPLAIN\sQUERY\sPLAN\soutput\sto\sdescribe\sUNION,\sUNION\sALL,\sEXCEPT\sand\sINTERSECT\soperations. +D 2010-11-11T17:48:51 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in e7a59672eaeb04408d1fa8501618d7501a3c5e39 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -174,7 +174,7 @@ F src/printf.c 8ae5082dd38a1b5456030c3755ec3a392cd51506 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50 F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 -F src/select.c de0cf4881f3503a72fba7a2cf59dc56dd563c5a5 +F src/select.c a88ad1cb4af99e47548760d4dd400d2405baff3c F src/shell.c 8517fc1f9c59ae4007e6cc8b9af91ab231ea2056 F src/sqlite.h.in f47e09412fc9a129f759fa4d96ef21f4b3d529eb F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754 @@ -365,7 +365,7 @@ F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea F test/enc2.test 6d91a5286f59add0cfcbb2d0da913b76f2242398 F test/enc3.test 5c550d59ff31dccdba5d1a02ae11c7047d77c041 F test/enc4.test 4b575ef09e0eff896e73bd24076f96c2aa6a42de -F test/eqp.test d4a411b212a687115a6efb7e0e143cf6592ce8af +F test/eqp.test 13c875a9a6b4e6fcdd36895d7791db6a7f124215 F test/eval.test bc269c365ba877554948441e91ad5373f9f91be3 F test/exclusive.test 53e1841b422e554cecf0160f937c473d6d0e3062 F test/exclusive2.test 76e63c05349cb70d09d60b99d2ae625525ff5155 @@ -886,7 +886,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 7ae068952fba4395b4aa437613a5ed2bd9ddf941 -R e485a0cebad0641fc6f1d38e91a1d634 +P 00fb8468b5f2c48a3c91b86803bf306a0331496f +R 64ead24f61500a4f0593c355fdf08678 U dan -Z c839f7f76a308e5561815c81b3e77973 +Z a73a264298070e2a412f911e555db5e3 diff --git a/manifest.uuid b/manifest.uuid index 578ad0ea1d..c9bb58f14a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -00fb8468b5f2c48a3c91b86803bf306a0331496f \ No newline at end of file +28643b85d93d27a44b9370e4087efa8fa2af7f8e \ No newline at end of file diff --git a/src/select.c b/src/select.c index fb3fb61afa..0f83bbb36f 100644 --- a/src/select.c +++ b/src/select.c @@ -831,7 +831,7 @@ static void explainComposite( if( pParse->explain==2 ){ Vdbe *v = pParse->pVdbe; char *zMsg = sqlite3MPrintf( - pParse->db, "COMPOSITE SUBQUERIES %d AND %d %s(%s)", iSub1, iSub2, + pParse->db, "COMPOUND SUBQUERIES %d AND %d %s(%s)", iSub1, iSub2, bUseTmp?"USING TEMP B-TREE ":"", selectOpName(op) ); sqlite3VdbeAddOp4(v, OP_Explain, pParse->iSelectId, 0, 0, zMsg, P4_DYNAMIC); diff --git a/test/eqp.test b/test/eqp.test index 3b57657cfe..742decff13 100644 --- a/test/eqp.test +++ b/test/eqp.test @@ -217,7 +217,7 @@ do_eqp_test 4.1.1 { } { 1 0 0 {SCAN TABLE t1 (~1000000 rows)} 2 0 0 {SCAN TABLE t2 (~1000000 rows)} - 0 0 0 {COMPOSITE SUBQUERIES 1 AND 2 (UNION ALL)} + 0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (UNION ALL)} } do_eqp_test 4.1.2 { SELECT * FROM t1 UNION ALL SELECT * FROM t2 ORDER BY 2 @@ -226,7 +226,7 @@ do_eqp_test 4.1.2 { 1 0 0 {USE TEMP B-TREE FOR ORDER BY} 2 0 0 {SCAN TABLE t2 (~1000000 rows)} 2 0 0 {USE TEMP B-TREE FOR ORDER BY} - 0 0 0 {COMPOSITE SUBQUERIES 1 AND 2 (UNION ALL)} + 0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (UNION ALL)} } do_eqp_test 4.1.3 { SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY 2 @@ -235,7 +235,7 @@ do_eqp_test 4.1.3 { 1 0 0 {USE TEMP B-TREE FOR ORDER BY} 2 0 0 {SCAN TABLE t2 (~1000000 rows)} 2 0 0 {USE TEMP B-TREE FOR ORDER BY} - 0 0 0 {COMPOSITE SUBQUERIES 1 AND 2 (UNION)} + 0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (UNION)} } do_eqp_test 4.1.4 { SELECT * FROM t1 INTERSECT SELECT * FROM t2 ORDER BY 2 @@ -244,7 +244,7 @@ do_eqp_test 4.1.4 { 1 0 0 {USE TEMP B-TREE FOR ORDER BY} 2 0 0 {SCAN TABLE t2 (~1000000 rows)} 2 0 0 {USE TEMP B-TREE FOR ORDER BY} - 0 0 0 {COMPOSITE SUBQUERIES 1 AND 2 (INTERSECT)} + 0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (INTERSECT)} } do_eqp_test 4.1.5 { SELECT * FROM t1 EXCEPT SELECT * FROM t2 ORDER BY 2 @@ -253,7 +253,7 @@ do_eqp_test 4.1.5 { 1 0 0 {USE TEMP B-TREE FOR ORDER BY} 2 0 0 {SCAN TABLE t2 (~1000000 rows)} 2 0 0 {USE TEMP B-TREE FOR ORDER BY} - 0 0 0 {COMPOSITE SUBQUERIES 1 AND 2 (EXCEPT)} + 0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (EXCEPT)} } do_eqp_test 4.2.2 { @@ -262,7 +262,7 @@ do_eqp_test 4.2.2 { 1 0 0 {SCAN TABLE t1 (~1000000 rows)} 1 0 0 {USE TEMP B-TREE FOR ORDER BY} 2 0 0 {SCAN TABLE t2 BY INDEX t2i1 (~1000000 rows)} - 0 0 0 {COMPOSITE SUBQUERIES 1 AND 2 (UNION ALL)} + 0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (UNION ALL)} } do_eqp_test 4.2.3 { SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY 1 @@ -271,7 +271,7 @@ do_eqp_test 4.2.3 { 1 0 0 {USE TEMP B-TREE FOR ORDER BY} 2 0 0 {SCAN TABLE t2 (~1000000 rows)} 2 0 0 {USE TEMP B-TREE FOR ORDER BY} - 0 0 0 {COMPOSITE SUBQUERIES 1 AND 2 (UNION)} + 0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (UNION)} } do_eqp_test 4.2.4 { SELECT * FROM t1 INTERSECT SELECT * FROM t2 ORDER BY 1 @@ -280,7 +280,7 @@ do_eqp_test 4.2.4 { 1 0 0 {USE TEMP B-TREE FOR ORDER BY} 2 0 0 {SCAN TABLE t2 (~1000000 rows)} 2 0 0 {USE TEMP B-TREE FOR ORDER BY} - 0 0 0 {COMPOSITE SUBQUERIES 1 AND 2 (INTERSECT)} + 0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (INTERSECT)} } do_eqp_test 4.2.5 { SELECT * FROM t1 EXCEPT SELECT * FROM t2 ORDER BY 1 @@ -289,7 +289,7 @@ do_eqp_test 4.2.5 { 1 0 0 {USE TEMP B-TREE FOR ORDER BY} 2 0 0 {SCAN TABLE t2 (~1000000 rows)} 2 0 0 {USE TEMP B-TREE FOR ORDER BY} - 0 0 0 {COMPOSITE SUBQUERIES 1 AND 2 (EXCEPT)} + 0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (EXCEPT)} } do_eqp_test 4.3.1 { @@ -297,7 +297,7 @@ do_eqp_test 4.3.1 { } { 1 0 0 {SCAN TABLE t1 (~1000000 rows)} 2 0 0 {SCAN TABLE t2 (~1000000 rows)} - 0 0 0 {COMPOSITE SUBQUERIES 1 AND 2 USING TEMP B-TREE (UNION)} + 0 0 0 {COMPOUND SUBQUERIES 1 AND 2 USING TEMP B-TREE (UNION)} } do_eqp_test 4.3.2 { @@ -305,9 +305,9 @@ do_eqp_test 4.3.2 { } { 2 0 0 {SCAN TABLE t1 (~1000000 rows)} 3 0 0 {SCAN TABLE t2 (~1000000 rows)} - 1 0 0 {COMPOSITE SUBQUERIES 2 AND 3 USING TEMP B-TREE (UNION)} + 1 0 0 {COMPOUND SUBQUERIES 2 AND 3 USING TEMP B-TREE (UNION)} 4 0 0 {SCAN TABLE t1 (~1000000 rows)} - 0 0 0 {COMPOSITE SUBQUERIES 1 AND 4 USING TEMP B-TREE (UNION)} + 0 0 0 {COMPOUND SUBQUERIES 1 AND 4 USING TEMP B-TREE (UNION)} } do_eqp_test 4.3.3 { SELECT x FROM t1 UNION SELECT x FROM t2 UNION SELECT x FROM t1 ORDER BY 1 @@ -315,10 +315,10 @@ do_eqp_test 4.3.3 { 2 0 0 {SCAN TABLE t1 (~1000000 rows)} 2 0 0 {USE TEMP B-TREE FOR ORDER BY} 3 0 0 {SCAN TABLE t2 BY COVERING INDEX t2i1 (~1000000 rows)} - 1 0 0 {COMPOSITE SUBQUERIES 2 AND 3 (UNION)} + 1 0 0 {COMPOUND SUBQUERIES 2 AND 3 (UNION)} 4 0 0 {SCAN TABLE t1 (~1000000 rows)} 4 0 0 {USE TEMP B-TREE FOR ORDER BY} - 0 0 0 {COMPOSITE SUBQUERIES 1 AND 4 (UNION)} + 0 0 0 {COMPOUND SUBQUERIES 1 AND 4 (UNION)} } finish_test -- 2.47.2