Further improvements to the sqlite_offset() function.

FossilOrigin-Name: 4230e2f5e068f2151fa33be25bb06123d41273dbe497a5ebc7173f8d7f81d160

diff --git a/manifest b/manifest
index 3d2f6909bcfd36f01ce9df53fd05d4ec03821c09..d4520ccadbfbcfd7825007e444d90c05c479e299 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\ssqlite_offset()\sfunction\sso\sthat\sit\sgives\sthe\scorrect\sanswer\seven\nif\sthe\sargument\sis\sa\svirtual\scolumn\sin\san\sindex-only\squery.\s\sTest\scases\nin\sTH3.
-D 2022-03-05T14:44:12.351
+C Further\simprovements\sto\sthe\ssqlite_offset()\sfunction.
+D 2022-03-05T19:36:29.116
 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 2ea24e2b9064064ebdcce697b8f0717a8a53d66ca7292e4a3c838f4dd0b21c89
+F src/vdbe.c 17ac5ed082a7f6832af3eb6c72b9a74049867c9a8c80b3c1e40faa017960941d
 F src/vdbe.h a1d0e3b934e835e73edd146f2e7c4eadb711b5c9875c18159a57483fd78e550e
 F src/vdbeInt.h 8dd91427155a38ec06e9ecbde07e33f21bc02e101625191e7613f883e379a363
 F src/vdbeapi.c 1c80efbe51118bbecc7279023e75d18edcfa4b3dc441287e1718ee70ad594f58
@@ -1944,8 +1944,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 dc88fc62f096bcf4df91406f565197f335333388121f860ba4424d9c881b0117
-R 2806557a3f81ede52f2013929b744554
+P 6029514b08b88e3fb3c0163813af38358490a6b6070b90f69975a324481394e5
+R f0549687576d457bd9294e013f1fc17c
 U drh
-Z b59d89faf70fb0b5b277341b5f59b059
+Z bfd7cd8391b1ab153c29141b066fa590
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 60d2989007a4522f82992106b224243aec9f2672..d0307986933cde043131925ab42c4a6c09da748c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6029514b08b88e3fb3c0163813af38358490a6b6070b90f69975a324481394e5
\ No newline at end of file
+4230e2f5e068f2151fa33be25bb06123d41273dbe497a5ebc7173f8d7f81d160
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index e0c1b47cd925c1fbbba9513e4f0be75a3086d420..e79ffe54fd05d9fe9093b689c96f53b5a2975d12 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2641,18 +2641,19 @@ case OP_Offset: {          /* out3 */
   VdbeCursor *pC;    /* The VDBE cursor */
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
   pC = p->apCsr[pOp->p1];
-  if( pC->deferredMoveto ){
-    rc = sqlite3VdbeFinishMoveto(pC);
-    if( rc ) goto abort_due_to_error;
-  }
   pOut = &p->aMem[pOp->p3];
-  if( NEVER(pC==0)
-   || pC->eCurType!=CURTYPE_BTREE
-   || NEVER(sqlite3BtreeEof(pC->uc.pCursor))
-  ){
+  if( pC==0 || pC->eCurType!=CURTYPE_BTREE ){
     sqlite3VdbeMemSetNull(pOut);
   }else{
-    sqlite3VdbeMemSetInt64(pOut, sqlite3BtreeOffset(pC->uc.pCursor));
+    if( pC->deferredMoveto ){
+      rc = sqlite3VdbeFinishMoveto(pC);
+      if( rc ) goto abort_due_to_error;
+    }
+    if( NEVER(sqlite3BtreeEof(pC->uc.pCursor)) ){
+      sqlite3VdbeMemSetNull(pOut);
+    }else{
+      sqlite3VdbeMemSetInt64(pOut, sqlite3BtreeOffset(pC->uc.pCursor));
+    }
   }
   break;
 }