Improvements to the description of the OPFLAG_TYPEOFARG option to OP_Column.

FossilOrigin-Name: 5e9c67ba18b701aabbb0546acdfc532c9e8f0d27fb0a2c899415a5c47096c90b

diff --git a/manifest b/manifest
index b6c85bb266d731b9d78378e6c25c016309220b9f..3fd16f12664cf52adfff67ec07db7394f21e929b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Adjust\sthe\simplementation\sof\ssqlite3VdbeTypeofColumn()\sto\smake\sit\seasier\nto\stest\s(and\sslightly\ssmaller).
-D 2022-10-13T14:35:20.191
+C Improvements\sto\sthe\sdescription\sof\sthe\sOPFLAG_TYPEOFARG\soption\sto\sOP_Column.
+D 2022-10-13T14:54:32.397
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -692,7 +692,7 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 0be191521ff6d2805995f4910f0b6231b42843678b2efdc1abecaf39929a673f
 F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
-F src/vdbe.c 4e51ba30edcdcec171fdb1db1133147ea1084d8b6842bc601b174e8a0e4b3b7f
+F src/vdbe.c 581496d84d7ce5b4f7302f14b3bc5271bbcef5dce28ce97c505297340e0c46e3
 F src/vdbe.h 58675f47dcf3105bab182c3ad3726efd60ffd003e954386904ac9107d0d2b743
 F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
 F src/vdbeapi.c 1e8713d0b653acb43cd1bdf579c40e005c4844ea90f414f065946a83db3c27fb
@@ -2034,8 +2034,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 45f171565442f9fd6574fb93ae7abe83c168b20be68af42531bc55571450d3ab
-R 0e1d021509719a6dc58294a46bab294e
+P 79fdd021df256c6a2b9973fd6bf8e52ffaaf4d369d40489b8395ac97880b1325
+R f513ee84e2c3c752a45dcdac513b8ce6
 U drh
-Z b79894d44bbaa33297da5bbb579b93c8
+Z 5b4f99a755b8cb54cd55294bc14ffa4e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 414ca045b4d05e48814e7536dff193275d72ebf9..fc10115bbef44c7c020fa7692c2df45c4c6a494a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-79fdd021df256c6a2b9973fd6bf8e52ffaaf4d369d40489b8395ac97880b1325
\ No newline at end of file
+5e9c67ba18b701aabbb0546acdfc532c9e8f0d27fb0a2c899415a5c47096c90b
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index b4a96468f137cc882fffe1e907a7d0a8f5dae011..f8878db316839849482a04749aab6446be671330 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2781,10 +2781,12 @@ case OP_Offset: {          /* out3 */
 ** if the P4 argument is a P4_MEM use the value of the P4 argument as
 ** the result.
 **
-** If the OPFLAG_LENGTHARG and OPFLAG_TYPEOFARG bits are set on P5 then
-** the result is guaranteed to only be used as the argument of a length()
-** or typeof() function, respectively.  The loading of large blobs can be
-** skipped for length() and all content loading can be skipped for typeof().
+** If the OPFLAG_LENGTHARG bit is set in P5 then the result is guaranteed
+** to only be used by the length() function or the equivalent.  The content
+** of large blobs is not loaded, thus saving CPU cycles.  If the
+** OPFLAG_TYPEOFARG bit is set then the result will only be used by the
+** typeof() function or the IS NULL or IS NOT NULL operators or the
+** equivalent.  In this case, all content loading can be omitted.
 */
 case OP_Column: {
   u32 p2;            /* column number to retrieve */