From: drh <drh@noemail.net>
Date: Mon, 14 Aug 2017 23:53:02 +0000 (+0000)
Subject: Minor size and performance optimization to sqlite3BtreeCloseCursor().
X-Git-Tag: version-3.21.0~159
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f38dd3b68fd90a1e8d913c242bb50d3d9c42298a;p=thirdparty%2Fsqlite.git

Minor size and performance optimization to sqlite3BtreeCloseCursor().

FossilOrigin-Name: 16969338841734d00ab906a94b82480c7e1e426eb0ddf7b9e6aed722aee5d91f
---

diff --git a/manifest b/manifest
index df3d92278a..d114803f0f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sinternal\sbtree\sroutine\smoveToRoot()\sto\sreturn\sSQLITE_EMPTY\sif\nthe\stable\sis\sempty\sor\sif\sit\shas\spgnoRoot==0.\s\sThis\ssimplifies\sthe\scallers,\nmaking\sthem\ssmaller\sand\sfaster.\s\sThe\sSQLITE_EMPTY\sresult\scode\sis\sintercepted\nand\schanged\sinto\sSQLITE_OK\sbefore\ssurfacing\sin\san\sAPI.
-D 2017-08-14T18:13:52.027
+C Minor\ssize\sand\sperformance\soptimization\sto\ssqlite3BtreeCloseCursor().
+D 2017-08-14T23:53:02.259
 F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
@@ -397,7 +397,7 @@ F src/auth.c 79f96c6f33bf0e5da8d1c282cee5ebb1852bb8a6ccca3e485d7c459b035d9c3c
 F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
-F src/btree.c 43d1c5b335984abd3f9d38e87305bb0da63a638d29ea35744aabad2ddbf9fa4d
+F src/btree.c 05781141fe24e9e24719a1d9c9b6ce38480af115f85a8a26f389a089888060d7
 F src/btree.h 3edc5329bc59534d2d15b4f069a9f54b779a7e51289e98fa481ae3c0e526a5ca
 F src/btreeInt.h 97700795edf8a43245720414798b7b29d8e465aef46bf301ffacd431910c0da1
 F src/build.c f8a85d2ad14c2201e10c2fe7185e1cb3f1db8b0c90d40d1fb99c20b135ab71bc
@@ -1647,7 +1647,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 25e92baaaeb9e8a2650b3083d3febf3661ecf1e05d9d24b26fe9f87a03bdd8fa
-R 842146c033a5d3f4b14318bddfc60ebc
+P 240d57143d943eaddd5f7c2d473f47a1d29417e61d28142f70f3d960bb9b30df
+R a7c4eab7d8d2ce1f319f583d46cbd640
 U drh
-Z 43daddc7888a0248763a7ce6f2befced
+Z e48f5e9e2a338851fd6ede62f6ca96de
diff --git a/manifest.uuid b/manifest.uuid
index 2c60456962..d88c8647b6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-240d57143d943eaddd5f7c2d473f47a1d29417e61d28142f70f3d960bb9b30df
\ No newline at end of file
+16969338841734d00ab906a94b82480c7e1e426eb0ddf7b9e6aed722aee5d91f
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index c1f8cd9364..dcd70b9283 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -4296,7 +4296,6 @@ int sqlite3BtreeCloseCursor(BtCursor *pCur){
     int i;
     BtShared *pBt = pCur->pBt;
     sqlite3BtreeEnter(pBtree);
-    sqlite3BtreeClearCursor(pCur);
     assert( pBt->pCursor!=0 );
     if( pBt->pCursor==pCur ){
       pBt->pCursor = pCur->pNext;
@@ -4315,7 +4314,7 @@ int sqlite3BtreeCloseCursor(BtCursor *pCur){
     }
     unlockBtreeIfUnused(pBt);
     sqlite3_free(pCur->aOverflow);
-    /* sqlite3_free(pCur); */
+    sqlite3_free(pCur->pKey);
     sqlite3BtreeLeave(pBtree);
   }
   return SQLITE_OK;