Faster computation of Expr.nHeight.

FossilOrigin-Name: a7a5af327ba8bafcd58b828e3e7a10d0008bb780d55a6c573aa15896dcc8ab89

diff --git a/manifest b/manifest
index 85470bd71979fe5cbfe539fc8ab680e8beadced1..ce8fcb65cac0ad574786e14e010212663f6b522f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Record\sthe\serror\soffset\son\sINTEGER\stokens.
-D 2022-02-06T11:26:51.988
+C Faster\scomputation\sof\sExpr.nHeight.
+D 2022-02-06T11:51:23.635
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -503,7 +503,7 @@ F src/date.c 41627dec396f3d33e2c317a065f9d59bb535982b2ea3a561c96e4d4cf1137b65
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c b5f1716b4d723db48254ee0f896e362cd029e865e05414139ea7f539f3884e1d
-F src/expr.c ddb6a18fcb231bd246c5570bc32b888ecfcccf4a145b141f63285b198205e84a
+F src/expr.c b90a029105a93a93a0ed5e5f8c5eaed8f19043a3b62e4c4d235a4611d9ada178
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 06e4ac33031b02dde7130c12e79cddf4dc5cfa72b23d8e63a3c26878fc9c1d3c
 F src/func.c 5a0379450bd19ca5cb2d65327b0df6466a14fa0f06f9355329c3e0eec483519a
@@ -1943,8 +1943,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 fa34676042720161ca03f3926814152eb1d144ec12fd2b44e5429408ea4ad5b0
-R de0e48e53f07c512f38151ad31733e2d
+P 38e057a580613be176552e230e40b4434a9ed57a82d407e92a23c7b8e62c0b0e
+R 17ee54b746725bb2605da7bcf56f32eb
 U drh
-Z 167cf3ec599a445193cb6da353ab517a
+Z 610e035a1e7d6996a44dc02d2b1f002f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index f17e0956da4dd1660305689652ef5b3380b20973..a3dab576b920ef55aeea0f9577d72eaeab7bedf7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-38e057a580613be176552e230e40b4434a9ed57a82d407e92a23c7b8e62c0b0e
\ No newline at end of file
+a7a5af327ba8bafcd58b828e3e7a10d0008bb780d55a6c573aa15896dcc8ab89
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 4c47f6fe6c84594b4cf1aea862f13b602b9ed277..271f06bc6afefdf2a08a1f71314e7ebed90f83af 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -769,9 +769,8 @@ static void heightOfSelect(const Select *pSelect, int *pnHeight){
 ** if appropriate.
 */
 static void exprSetHeight(Expr *p){
-  int nHeight = 0;
-  heightOfExpr(p->pLeft, &nHeight);
-  heightOfExpr(p->pRight, &nHeight);
+  int nHeight = p->pLeft ? p->pLeft->nHeight : 0;
+  if( p->pRight && p->pRight->nHeight>nHeight ) nHeight = p->pRight->nHeight;
   if( ExprUseXSelect(p) ){
     heightOfSelect(p->x.pSelect, &nHeight);
   }else if( p->x.pList ){