Futher improvements to LEFT JOIN strength reduction.

FossilOrigin-Name: 8a39167bd2d46496f7484cfec371e4bad22da882209b01da9459c4ed5877da25

diff --git a/manifest b/manifest
index 7ab0dcc58728d85287034b6277f3d399a83eebde..055fc9b89e1a14519385cb275033dff84f3929ea 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\sthe\sLEFT\sJOIN\sstrength\sreduction\soptimization.
-D 2019-10-11T16:01:21.642
+C Futher\simprovements\sto\sLEFT\sJOIN\sstrength\sreduction.
+D 2019-10-11T17:14:40.541
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -477,7 +477,7 @@ F src/date.c e1d8ac7102f3f283e63e13867acb0efa33861cf34f0faf4cdbaf9fa7a1eb7041
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
 F src/dbstat.c c12833de69cb655751487d2c5a59607e36be1c58ba1f4bd536609909ad47b319
 F src/delete.c d08c9e01a2664afd12edcfa3a9c6578517e8ff8735f35509582693adbe0edeaf
-F src/expr.c 8e82108846bb8ad0651feb1672eb8aae82158b6240f5677bc72d6cdf80e9d7a8
+F src/expr.c 4c2a0d00a0d7701811a463b9af2c63d10b0c5ee7b8bde249309184f82d27b5b0
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 6271fda51794b569d736eba4097d28f13080cd0c9eb66d5fcecb4b77336fae50
 F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12
@@ -1846,7 +1846,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4ed905b18847d4dbf5a2570052abced338065f824137b90300f62d77b3159d80
-R b207e5537fa5845b32cb8d65da5d4e9f
+P 548082dfab5d9484279ccc11cd2833ac131b54b7481372b576d7c28bbb3294ea
+R e92862a2f034c9f00bf2d8147c0c666e
 U drh
-Z 75f587b0cae941ddcaa1476b9bca25c8
+Z e5d0b13ba33a14a9603b6e44d6857a13

diff --git a/manifest.uuid b/manifest.uuid
index fad3987b87f85410de72670c4b08a73fccb69cb0..44c15341587d6a40127c63f61d2816ce6aaf541f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-548082dfab5d9484279ccc11cd2833ac131b54b7481372b576d7c28bbb3294ea
\ No newline at end of file
+8a39167bd2d46496f7484cfec371e4bad22da882209b01da9459c4ed5877da25
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index e28a7b044e2abccbecfb6b9413eb9da34e4abe23..0e827482b2e73d12a08976bf14b68f892b3d109f 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -5234,9 +5234,11 @@ int sqlite3ExprImpliesNonNullRow(Expr *p, int iTab){
   if( p==0 ) return 0;
   if( p->op==TK_NOTNULL ){
     p = p->pLeft;
-  }else if( p->op==TK_AND ){
-    if( sqlite3ExprImpliesNonNullRow(p->pLeft, iTab) ) return 1;
-    p = p->pRight;
+  }else{
+    while( p->op==TK_AND ){
+      if( sqlite3ExprImpliesNonNullRow(p->pLeft, iTab) ) return 1;
+      p = p->pRight;
+    }
   }
   w.xExprCallback = impliesNotNullRow;
   w.xSelectCallback = 0;