Small performance and size improvement to OP_Found.

FossilOrigin-Name: 81587a18b7c0516628453000172a0c58e74ee173c15f655d035799d84d4e2d81

diff --git a/manifest b/manifest
index 24a5d04278d50696f086201f97593ecfd5c92c55..1c8de88e1e99d218b3ea7c952a0b5f8d8bd59d16 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Tag\san\salways-taken\sbranch\susing\sALWAYS().
-D 2022-04-04T19:58:55.827
+C Small\sperformance\sand\ssize\simprovement\sto\sOP_Found.
+D 2022-04-04T20:20:22.930
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -624,7 +624,7 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
 F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3
-F src/vdbe.c 61ff67a29b89214c928631be206af9cb5f820ed46b8cec3e58308fea205123e4
+F src/vdbe.c 4d8f5b013e1ad47240e9822217a4ac76041afd2667dcbefd26f598fe45f729a5
 F src/vdbe.h 89f5edb1422c8783a0b29db836e409876f2b3e847f78e2b21b1fbcc48a93f85f
 F src/vdbeInt.h 5f3d0abcf30c2b7a6672ad4386f18be0fca9c9b2cefe18f85a2e3df74f2613bf
 F src/vdbeapi.c 354c893f1500cf524cc45c32879b9c68893a28b77e3442c24668d6afe4236217
@@ -1945,8 +1945,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 5c3357ad62843fe982b9c2d31dbf02018f2948ceab2c85dac917cd9ce1e97dd6
-R e1baec0a4623bc482b84ffca80620d79
+P ad8bc3d7443ff57ce5a8756428e717ac42ec0295191a9b4d7ae44846d8fa03a2
+R f24c2291256936df51ada2b187bd8ef3
 U drh
-Z 85eb1104cf0cb5341f01b52e5988e935
+Z 8dca514d63cc68731f709c5c7575f708
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 72687ca8ac4601b65588c3df6b36bbfdf29463ac..b114205a3a5d48929095c47292f99280064cac68 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ad8bc3d7443ff57ce5a8756428e717ac42ec0295191a9b4d7ae44846d8fa03a2
\ No newline at end of file
+81587a18b7c0516628453000172a0c58e74ee173c15f655d035799d84d4e2d81
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index c29198f747689f11714fd2745a5a17943b4e38ea..02d0988f10ad7e4b81b3ae2f6fd5f733e78368f2 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -4968,7 +4968,6 @@ case OP_Found: {        /* jump, in3 */
   int alreadyExists;
   int ii;
   VdbeCursor *pC;
-  int res;
   UnpackedRecord *pIdxKey;
   UnpackedRecord r;
 
@@ -5000,7 +4999,7 @@ case OP_Found: {        /* jump, in3 */
       if( ii ) REGISTER_TRACE(pOp->p3+ii, &r.aMem[ii]);
     }
 #endif
-    rc = sqlite3BtreeIndexMoveto(pC->uc.pCursor, &r, &res);
+    rc = sqlite3BtreeIndexMoveto(pC->uc.pCursor, &r, &pC->seekResult);
   }else{
     /* Composite key generated by OP_MakeRecord */
     assert( pIn3->flags & MEM_Blob );
@@ -5012,14 +5011,13 @@ case OP_Found: {        /* jump, in3 */
     if( pIdxKey==0 ) goto no_mem;
     sqlite3VdbeRecordUnpack(pC->pKeyInfo, pIn3->n, pIn3->z, pIdxKey);
     pIdxKey->default_rc = 0;
-    rc = sqlite3BtreeIndexMoveto(pC->uc.pCursor, pIdxKey, &res);
+    rc = sqlite3BtreeIndexMoveto(pC->uc.pCursor, pIdxKey, &pC->seekResult);
     sqlite3DbFreeNN(db, pIdxKey);
   }
   if( rc!=SQLITE_OK ){
     goto abort_due_to_error;
   }
-  pC->seekResult = res;
-  alreadyExists = (res==0);
+  alreadyExists = (pC->seekResult==0);
   pC->nullRow = 1-alreadyExists;
   pC->deferredMoveto = 0;
   pC->cacheStatus = CACHE_STALE;