From: dan <Dan Kennedy>
Date: Mon, 5 Dec 2022 19:16:23 +0000 (+0000)
Subject: Enhance the sqlite3_stmt_scanstatus() API and add sqlite3_stmt_scanstatus_v2(). For... 
X-Git-Tag: version-3.41.0~307
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2db31c971cf0abb4dbe0ab51bfe0e8dbee232f2;p=thirdparty%2Fsqlite.git

Enhance the sqlite3_stmt_scanstatus() API and add sqlite3_stmt_scanstatus_v2(). For creation of enhanced query performance reports.

FossilOrigin-Name: 4893b4e3eafc7c9c22b24717f90a585862203f987cf108b079ce6e946093e675
---

d2db31c971cf0abb4dbe0ab51bfe0e8dbee232f2
diff --cc manifest
index 66f7ed61f6,d0d1acb7a2..9b85c87887
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\stest\scase\sthat\sshould\shave\sbeen\spart\sof\sprevious\scommit.
- D 2022-12-05T14:20:54.124
 -C Update\scomments\sin\ssqlite.h.in\sto\saccount\sfor\ssqlite3_stmt_scanstatus_v2().
 -D 2022-12-05T18:52:12.491
++C Enhance\sthe\ssqlite3_stmt_scanstatus()\sAPI\sand\sadd\ssqlite3_stmt_scanstatus_v2().\sFor\screation\sof\senhanced\squery\sperformance\sreports.
++D 2022-12-05T19:16:23.509
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1457,7 -1457,8 +1457,8 @@@ F test/savepoint5.test 0735db177e0ebbae
  F test/savepoint6.test f41279c5e137139fa5c21485773332c7adb98cd7
  F test/savepoint7.test cde525ea3075283eb950cdcdefe23ead4f700daa
  F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2
- F test/scanstatus.test 9a0ed37ab6d57b50567282788fffdf832d9b16739ecc41bff9d77a8d767cf317
+ F test/scanstatus.test 7dbcfd6adc6a8df6abc59f83d6da5a27e1bce0b2f6fa55147c8176d7c44e0450
 -F test/scanstatus2.test 503c8529111fbac777b225b846f3a31a020e80950d40763b65953fae46e9ceb9
++F test/scanstatus2.test cc0be2f645c32ede50affa7d4ecfaffd2b4572a4fd7f723082397c65a910a2b5
  F test/schema.test 5dd11c96ba64744de955315d2e4f8992e447533690153b93377dffb2a5ef5431
  F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5
  F test/schema3.test 8ed4ae66e082cdd8b1b1f22d8549e1e7a0db4527a8e6ee8b6193053ee1e5c9ce
@@@ -2066,8 -2067,8 +2067,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 15f0be8a640e7bfa4130edd4650a745337bd96083b119a1553f9abf9ff066806
- R 0d5d7f5190e8e855ad343ae2d8e33bd7
 -P 1a72777b1279f74f212fb2f675a4594a238e5d28f048879d7f5ad5287673c3c4
 -R 8c721203ec6b199973a0c855b39497c4
++P dc7dd2d3e50e7cc474b22f1b5b219da32bcd7aa1ba56864d1dbcf0d3a6fa06f2 009462f2344b1f468cf9440343a47fec68d783a2bfb4fa6168bb227ec910b918
++R 6f58eb8b4613cbdc0da9cabf0de9170c
  U dan
- Z 56bab95316a0c053d879db2cb26ee05d
 -Z 6aa6d3a2a8294beaab19425ddd9ee52d
++Z dd8e28132ec997579f72120c72f627ae
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 6117ebbdad,34762ab775..e55b14b4b2
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- dc7dd2d3e50e7cc474b22f1b5b219da32bcd7aa1ba56864d1dbcf0d3a6fa06f2
 -009462f2344b1f468cf9440343a47fec68d783a2bfb4fa6168bb227ec910b918
++4893b4e3eafc7c9c22b24717f90a585862203f987cf108b079ce6e946093e675
diff --cc test/scanstatus2.test
index 0000000000,784ed290d6..3c5b4b16a3
mode 000000,100644..100644
--- a/test/scanstatus2.test
+++ b/test/scanstatus2.test
@@@ -1,0 -1,159 +1,159 @@@
 -# 2014 November 1
++# 2022 December 5
+ #
+ # The author disclaims copyright to this source code.  In place of
+ # a legal notice, here is a blessing:
+ #
+ #    May you do good and not evil.
+ #    May you find forgiveness for yourself and forgive others.
+ #    May you share freely, never taking more than you give.
+ #
+ #***********************************************************************
+ #
+ 
+ set testdir [file dirname $argv0]
+ source $testdir/tester.tcl
+ set testprefix scanstatus2
+ 
+ ifcapable !scanstatus {
+   finish_test
+   return
+ }
+ 
+ do_execsql_test 1.0 {
+   CREATE TABLE t1(a, b);
+   CREATE TABLE t2(x, y);
+   INSERT INTO t1 VALUES(1, 2);
+   INSERT INTO t1 VALUES(3, 4);
+   INSERT INTO t2 VALUES('a', 'b');
+   INSERT INTO t2 VALUES('c', 'd');
+   INSERT INTO t2 VALUES('e', 'f');
+ }
+ 
+ proc do_zexplain_test {v2 tn sql res} {
+   db eval $sql
+   set stmt [db version -last-stmt-ptr]
+   set idx 0
+   set ret [list]
+ 
+   set cmd sqlite3_stmt_scanstatus
+   set f [list]
+   if {$v2} { lappend f complex }
+ 
+   while {1} {
+     set r [sqlite3_stmt_scanstatus -flags $f $stmt $idx]
+     if {[llength $r]==0} break
+     lappend ret [dict get $r zExplain]
+     incr idx
+   }
+   uplevel [list do_test $tn [list set {} $ret] [list {*}$res]]
+ }
+ 
+ proc get_cycles {stmt} {
+   set r [sqlite3_stmt_scanstatus $stmt -1]
+   dict get $r nCycle
+ }
+ 
+ proc foreach_scan {varname stmt body} {
+   upvar $varname var
+ 
+   for {set ii 0} {1} {incr ii} {
+     set r [sqlite3_stmt_scanstatus -flags complex $stmt $ii]
+     if {[llength $r]==0} break
+     array set var $r
+     uplevel $body
+   }
+ }
+ 
+ proc get_eqp_graph {stmt iPar nIndent} {
+   set res ""
+   foreach_scan A $stmt {
+     if {$A(iParentId)==$iPar} {
+       set txt $A(zExplain)
+       if {$A(nCycle)>=0} {
+         append txt " (nCycle=$A(nCycle))"
+       }
+       append res "[string repeat - $nIndent]$txt\n"
+       append res [get_eqp_graph $stmt $A(iSelectId) [expr $nIndent+2]]
+     }
+   }
+   set res
+ }
+ 
+ proc get_graph {stmt} {
+   set nCycle [get_cycles $stmt]
+   set res "QUERY (nCycle=$nCycle)\n"
+   append res [get_eqp_graph $stmt 0 2]
+ }
+ 
+ proc do_graph_test {tn sql res} {
+   db eval $sql
+   set stmt [db version -last-stmt-ptr]
+ 
+   set graph [string trim [get_graph $stmt]]
+   set graph [regsub -all {nCycle=[0-9]+} $graph nCycle=nnn]
+   uplevel [list do_test $tn [list set {} $graph] [string trim $res]]
+ }
+ 
+ proc puts_graph {sql} {
+   db eval $sql
+   set stmt [db version -last-stmt-ptr]
+   puts [string trim [get_graph $stmt]]
+ }
+ 
+ 
+ do_zexplain_test 0 1.1 {
+   SELECT (SELECT a FROM t1 WHERE b=x) FROM t2 WHERE y=2
+ } {
+   {SCAN t2}
+   {SCAN t1}
+ }
+ do_zexplain_test 1 1.2 {
+   SELECT (SELECT a FROM t1 WHERE b=x) FROM t2 WHERE y=2
+ } {
+   {SCAN t2}
+   {CORRELATED SCALAR SUBQUERY 1}
+   {SCAN t1}
+ }
+ 
+ do_graph_test 1.3 {
+   SELECT (SELECT a FROM t1 WHERE b=x) FROM t2 WHERE y=2
+ } {
+ QUERY (nCycle=nnn)
+ --SCAN t2
+ --CORRELATED SCALAR SUBQUERY 1 (nCycle=nnn)
+ ----SCAN t1
+ }
+ 
+ do_graph_test 1.4 {
+   WITH v2(x,y) AS MATERIALIZED (
+     SELECT x,y FROM t2
+   )
+   SELECT * FROM t1, v2 ORDER BY y;
+ } {
+ QUERY (nCycle=nnn)
+ --MATERIALIZE v2 (nCycle=nnn)
+ ----SCAN t2
+ --SCAN v2
+ --SCAN t1
+ --USE TEMP B-TREE FOR ORDER BY (nCycle=nnn)
+ }
+ 
+ #-------------------------------------------------------------------------
+ reset_db
+ do_execsql_test 2.0 {
+   CREATE VIRTUAL TABLE ft USING fts5(a);
+   INSERT INTO ft VALUES('abc');
+   INSERT INTO ft VALUES('def');
+   INSERT INTO ft VALUES('ghi');
+ }
+ 
+ do_graph_test 2.1 {
+   SELECT * FROM ft('def')
+ } {
+ QUERY (nCycle=nnn)
+ --SCAN ft VIRTUAL TABLE INDEX 0:M1 (nCycle=nnn)
+ }
+ 
+ finish_test
+ 
+