From: drh <>
Date: Fri, 1 Apr 2022 21:01:37 +0000 (+0000)
Subject: The putVarint32() macro does not optimize well.  So expand it into in-line
X-Git-Tag: version-3.39.0~259
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b47b1f67dca06317908c5c512f0b2352394836f0;p=thirdparty%2Fsqlite.git

The putVarint32() macro does not optimize well.  So expand it into in-line
code in places were performance is an issue.

FossilOrigin-Name: 390c239e53cf936a97b268dce8171f0b17050542ae64735ca8ef375fec2c9544
---

diff --git a/manifest b/manifest
index fd9b504655..1aaae798d6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Loop\soptimization\sin\sthe\sOP_MakeRecord\sopcode.
-D 2022-04-01T20:39:40.291
+C The\sputVarint32()\smacro\sdoes\snot\soptimize\swell.\s\sSo\sexpand\sit\sinto\sin-line\ncode\sin\splaces\swere\sperformance\sis\san\sissue.
+D 2022-04-01T21:01:37.702
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -492,7 +492,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c d705859e23fbd7b3c6cd5874f973b5c4fa083eab861398aac95bea7de9a7ed07
+F src/btree.c 45161c2d5c9527b9c9bbfd7478daf3e0a619cf4bbe3278378aaea3d4b4e4f5b5
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
 F src/build.c 4a265d49342cefc95ae739982a6197eae04a9258151f8e0bbe3ff8ab56aab801
@@ -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 0e54be9acfe26e68b94d946cbaf0c8dfe94435e8a506f22ad5550ae4db1d7a0c
+F src/vdbe.c ced0c7b4b872bd30b25f40be70c0ecae095b1dafd9510912ed24369b7efef335
 F src/vdbe.h a1d0e3b934e835e73edd146f2e7c4eadb711b5c9875c18159a57483fd78e550e
 F src/vdbeInt.h 22babf1e585ae7e5c49f2e6442969b88f07bdcc3d154164346d25ef4efa3ebf3
 F src/vdbeapi.c 5c498998c99667f16cac2519f2fa439fe46acf99a332b0caa73637fc2ab35c22
@@ -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 8a07745aed1d0a4eead55d43f1923597b12371f307ecf5bc19c5a1db9a107a50
-R 8f846dfb58734bb88c205139ba75a9df
+P 47a61fbd63928021098fbe492283f1afda7c293b3b2706c001192ae4ff1b2cbe
+R ade274038cb2118d099723f504530cb1
 U drh
-Z 0a0d680f496f86b11293db3c46b2ee9c
+Z 4ae04a2d928465896e499e8a40353d10
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 246b8f5a89..8c666935af 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-47a61fbd63928021098fbe492283f1afda7c293b3b2706c001192ae4ff1b2cbe
\ No newline at end of file
+390c239e53cf936a97b268dce8171f0b17050542ae64735ca8ef375fec2c9544
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index eb3dbb0a3c..9e721ee5af 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -9314,7 +9314,11 @@ int sqlite3BtreeTransferRow(BtCursor *pDest, BtCursor *pSrc, i64 iKey){
   u32 nRem;                     /* Bytes of data still to copy */
 
   getCellInfo(pSrc);
-  aOut += putVarint32(aOut, pSrc->info.nPayload);
+  if( pSrc->info.nPayload<0x80 ){
+    *(aOut++) = pSrc->info.nPayload;
+  }else{
+    aOut += sqlite3PutVarint(aOut, pSrc->info.nPayload);
+  }
   if( pDest->pKeyInfo==0 ) aOut += putVarint(aOut, iKey);
   nIn = pSrc->info.nLocal;
   aIn = pSrc->info.pPayload;
diff --git a/src/vdbe.c b/src/vdbe.c
index 8ad6cd19f6..07dfc63258 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -3374,14 +3374,22 @@ case OP_MakeRecord: {
   zPayload = zHdr + nHdr;
 
   /* Write the record */
-  zHdr += putVarint32(zHdr, nHdr);
+  if( nHdr<0x80 ){
+    *(zHdr++) = nHdr;
+  }else{
+    zHdr += sqlite3PutVarint(zHdr,nHdr);
+  }
   assert( pData0<=pLast );
   pRec = pData0;
   while( 1 /*exit-by-break*/ ){
     serial_type = pRec->uTemp;
     /* EVIDENCE-OF: R-06529-47362 Following the size varint are one or more
     ** additional varints, one per column. */
-    zHdr += putVarint32(zHdr, serial_type);            /* serial type */
+    if( serial_type<0x80 ){
+      *(zHdr++) = serial_type;
+    }else{
+      zHdr += sqlite3PutVarint(zHdr, serial_type);
+    }
     /* EVIDENCE-OF: R-64536-51728 The values for each column in the record
     ** immediately follow the header. */
     zPayload += sqlite3VdbeSerialPut(zPayload, pRec, serial_type); /* content */