From: drh <>
Date: Tue, 11 Jun 2024 18:22:48 +0000 (+0000)
Subject: Provide the ability to disable the exists-to-join optimization using
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ddc62664bfb5e3237b20098b30e4a99815c322e0;p=thirdparty%2Fsqlite.git

Provide the ability to disable the exists-to-join optimization using
SQLITE_TESTCTRL_OPTIMIZATIONS.  Provide tree-trace output for the optimization.

FossilOrigin-Name: 33a3f327855b427ae6ba0057218d043a1417bc9d780728f47f23acdd836e1686
---

diff --git a/manifest b/manifest
index 0b5c406027..13e08125d6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\strunk\senhancements\sinto\sthe\sexists-to-join\sbranch.
-D 2024-06-11T17:37:36.892
+C Provide\sthe\sability\sto\sdisable\sthe\sexists-to-join\soptimization\susing\nSQLITE_TESTCTRL_OPTIMIZATIONS.\s\sProvide\stree-trace\soutput\sfor\sthe\soptimization.
+D 2024-06-11T18:22:48.334
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -755,12 +755,12 @@ F src/printf.c 8b250972305e14b365561be5117ed0fd364e4fd58968776df1ce64c6280b90f9
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 9c7786f032dea81487e7d94cb17849936f0e9b8891bfc91a6ac24ab193762804
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
-F src/select.c 9c65721098bad3f2cf266ef8e6aa8c0d57a691a48c075d5e8b1a44fa4fa7e351
+F src/select.c decd5944639f604eba66bcf28161c1beb09b7762093aadc25313a0fe62ce9a5f
 F src/shell.c.in ad27d1d990e9e5fb7ae8fc38a717e91f55233714f59723e5618baf4a2a3d2b65
 F src/sqlite.h.in cbd3e4177791a61c056fd81e37a5b21bb6c8cb2ea8cac558c625974673f50acf
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
-F src/sqliteInt.h c62b054b581abb051018ddc503bc292f3103db1e5ee16346f1495d46c07c5d3b
+F src/sqliteInt.h b0c079cec6aa6a133af52489c14a4d8c2d750889594299d83eab1ae1b12979c0
 F src/sqliteLimit.h 6878ab64bdeb8c24a1d762d45635e34b96da21132179023338c93f820eee6728
 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -2197,8 +2197,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 078537d057d638389e3ab3bc04bcac53f342c7bf1d8d75222296ef42d09e9ee7 6935ac71bad3d36cc519f0325ae4447a674f257309d020cdc0741160fcce0580
-R b6e202e4f08c9d1d4b557c05911f57ed
+P 5f25a9518a675efbd0525cc2f5595ee7bc7122be7cfecdf6b20c909185dea370
+R b17f1837a5067fb4548e9e703c412c5a
 U drh
-Z 025c74f5e2115680217e065394f815d9
+Z e7e7ba1dc895b6e1b772b1a24ff19dc3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 78990c287e..f005164c32 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5f25a9518a675efbd0525cc2f5595ee7bc7122be7cfecdf6b20c909185dea370
\ No newline at end of file
+33a3f327855b427ae6ba0057218d043a1417bc9d780728f47f23acdd836e1686
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 69a07528fa..e546a664cd 100644
--- a/src/select.c
+++ b/src/select.c
@@ -7421,7 +7421,14 @@ static void existsToJoin(Parse *pParse, Select *p, Expr *pWhere){
 
           pSub->pWhere = 0;
           pSub->pSrc = 0;
-          sqlite3SelectDelete(pParse->db, pSub);
+          sqlite3ParserAddCleanup(pParse, sqlite3SelectDeleteGeneric, pSub);
+#if TREETRACE_ENABLED
+          if( sqlite3TreeTrace & 0x100000 ){
+            TREETRACE(0x100000,pParse,p,
+                      ("After EXISTS-to-JOIN optimization:\n"));
+            sqlite3TreeViewSelect(0, p, 0);
+          }
+#endif
         }
       }
     }
@@ -7756,7 +7763,7 @@ int sqlite3Select(
 
   /* If there may be an "EXISTS (SELECT ...)" in the WHERE clause, attempt
   ** to change it into a join.  */
-  if( pParse->bHasExists ){
+  if( pParse->bHasExists && OptimizationEnabled(db,SQLITE_ExistsToJoin) ){
     existsToJoin(pParse, p, p->pWhere);
     pTabList = p->pSrc;
   }
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index c976b928dd..6a1b22f92d 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1126,6 +1126,7 @@ extern u32 sqlite3TreeTrace;
 **   0x00020000     Transform DISTINCT into GROUP BY
 **   0x00040000     SELECT tree dump after all code has been generated
 **   0x00080000     NOT NULL strength reduction
+**   0x00100000     EXISTS-to-JOIN optimization
 */
 
 /*
@@ -1924,6 +1925,7 @@ struct sqlite3 {
 #define SQLITE_Coroutines     0x02000000 /* Co-routines for subqueries */
 #define SQLITE_NullUnusedCols 0x04000000 /* NULL unused columns in subqueries */
 #define SQLITE_OnePass        0x08000000 /* Single-pass DELETE and UPDATE */
+#define SQLITE_ExistsToJoin   0x10000000 /* The EXISTS-to-JOIN optimization */
 #define SQLITE_AllOpts        0xffffffff /* All optimizations */
 
 /*