More precise computation of the size of data structures in the query planner.

Response to [forum:/forumpost/7d8685d49d|Forum post 7d8685d49d].

FossilOrigin-Name: 0c8d88e41167ea92341dd1129be01b596a73f46bdcd5b0dd931441a979c013d0

diff --git a/manifest b/manifest
index 953c6c496eface81140ed25a6b1d62ecfa27cea8..a7282ce5e3fca5dae363e93c24da204c00d19b9b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sALWAYS()\sand\sNEVER()\son\sbranches\smade\sunreachable\sby\srecent\schanges.
-D 2023-12-19T14:53:39.236
+C More\sprecise\scomputation\sof\sthe\ssize\sof\sdata\sstructures\sin\sthe\squery\splanner.\nResponse\sto\s[forum:/forumpost/7d8685d49d|Forum\spost\s7d8685d49d].
+D 2023-12-19T14:54:52.797
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -821,7 +821,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c e5247a3406531b705b44630e9ccf9ca0e5c74955ef19c06fbb146d765c500c20
 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
 F src/walker.c 7c7ea0115345851c3da4e04e2e239a29983b61fb5b038b94eede6aba462640e2
-F src/where.c dad4b472b8dc886c0962409e70978568c06b5108bcf3dcd4938a9305a3540440
+F src/where.c e80c22f033edc5bdaf992e32bb740831d90a19e8bc3e68523a27add2478c1f65
 F src/whereInt.h 4b38c5889514e3aead3f27d0ee9a26e47c3f150efc59e2a8b4e3bc8835e4d7a1
 F src/wherecode.c 5d77db30a2a3dd532492ae882de114edba2fae672622056b1c7fd61f5917a8f1
 F src/whereexpr.c dc5096eca5ed503999be3bdee8a90c51361289a678d396a220912e9cb73b3c00
@@ -2155,8 +2155,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 34ae36a45e814bed7c8340412c7ef3fc849b82357656d0eb5f0f805e59d846d0
-R 230ae607a1ac4af9df29a9d81c13bbb8
+P c50e6c2ace49d0928b05cbfd877c621e9a0f77dc4e056ccb1dbe5cf118a00d00
+R 5113ea05f125ae14859665eea256b645
 U drh
-Z 438b65489898c6edaccdbf5c80ee427e
+Z f458582e6d386df7f8168eaec2603f07
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 4d47d9517af2fd38736720672c7943e35642297e..82c46f6dfd8a69095e6247b9585cd804264aa7d4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c50e6c2ace49d0928b05cbfd877c621e9a0f77dc4e056ccb1dbe5cf118a00d00
\ No newline at end of file
+0c8d88e41167ea92341dd1129be01b596a73f46bdcd5b0dd931441a979c013d0
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index c98f92d5a8bbb4071ffcb9d7fdff54da82bc6309..15f206a0999b6763d96cd9458f228b7d3f54e5c8 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -6038,7 +6038,10 @@ WhereInfo *sqlite3WhereBegin(
   ** field (type Bitmask) it must be aligned on an 8-byte boundary on
   ** some architectures. Hence the ROUND8() below.
   */
-  nByteWInfo = ROUND8P(sizeof(WhereInfo)+(nTabList-1)*sizeof(WhereLevel));
+  nByteWInfo = ROUND8P(sizeof(WhereInfo));
+  if( nTabList>1 ){
+    nByteWInfo = ROUND8P(nByteWInfo + (nTabList-1)*sizeof(WhereLevel));
+  }
   pWInfo = sqlite3DbMallocRawNN(db, nByteWInfo + sizeof(WhereLoop));
   if( db->mallocFailed ){
     sqlite3DbFree(db, pWInfo);