From: dan <dan@noemail.net>
Date: Fri, 28 Sep 2018 20:46:41 +0000 (+0000)
Subject: Have sqlite3changegroup_output_strm() call its output function more regularly.
X-Git-Tag: version-3.26.0~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8248c42f97fdfd27d1b92280314100233653074;p=thirdparty%2Fsqlite.git

Have sqlite3changegroup_output_strm() call its output function more regularly.

FossilOrigin-Name: 8467c31aa0bf24e597f680748460a99f425c49f5ab741c3574c339aa56857146
---

diff --git a/ext/session/sqlite3session.c b/ext/session/sqlite3session.c
index e432b894ca..abbf16dc75 100644
--- a/ext/session/sqlite3session.c
+++ b/ext/session/sqlite3session.c
@@ -4866,13 +4866,12 @@ static int sessionChangegroupOutput(
         sessionAppendByte(&buf, p->op, &rc);
         sessionAppendByte(&buf, p->bIndirect, &rc);
         sessionAppendBlob(&buf, p->aRecord, p->nRecord, &rc);
+        if( rc==SQLITE_OK && xOutput && buf.nBuf>=SESSIONS_STRM_CHUNK_SIZE ){
+          rc = xOutput(pOut, buf.aBuf, buf.nBuf);
+          buf.nBuf = 0;
+        }
       }
     }
-
-    if( rc==SQLITE_OK && xOutput && buf.nBuf>=SESSIONS_STRM_CHUNK_SIZE ){
-      rc = xOutput(pOut, buf.aBuf, buf.nBuf);
-      buf.nBuf = 0;
-    }
   }
 
   if( rc==SQLITE_OK ){
diff --git a/manifest b/manifest
index 9787027a1d..dfdb94b268 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\sthe\ssqlite_memstat\svirtual\stable\sthat\swas\scausing\sit\sto\sreport\nthe\samount\sof\smemory\sused\sas\szero\sbytes.
-D 2018-09-28T18:51:18.258
+C Have\ssqlite3changegroup_output_strm()\scall\sits\soutput\sfunction\smore\sregularly.
+D 2018-09-28T20:46:41.755
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 01e95208a78b57d056131382c493c963518f36da4c42b12a97eb324401b3a334
@@ -416,7 +416,7 @@ F ext/session/sessionfault2.test 555a8504de03d59b369ef20209585da5aeb2671dedabc45
 F ext/session/sessionrebase.test 4e1bcfd26fd8ed8ac571746f56cceeb45184f4d65490ea0d405227cfc8a9cba8
 F ext/session/sessionstat1.test 41cd97c2e48619a41cdf8ae749e1b25f34719de638689221aa43971be693bf4e
 F ext/session/sessionwor.test 2f3744236dc8b170a695b7d8ddc8c743c7e79fdc
-F ext/session/sqlite3session.c 2d29bbd888599b94b2c8b31ff433675e008273a4d225b336508b18e6187fec1d
+F ext/session/sqlite3session.c ba76c7f01d4c71ab4d134cfda0ba43faae04bff01b8e81d1279a6101c706e3b5
 F ext/session/sqlite3session.h c01820d5b6e73e86d88008f4d1c1c7dfb83422963018292b864028a0400ceccf
 F ext/session/test_session.c dba36c6c0153b22501112d3e8882b5c946cf617c955153b6712bd2f8ba1428c0
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
@@ -1770,7 +1770,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 4505bbae58357eacab262b642b2a56d6dd380de72faceb5bbfd042eb94a12c06
-R a4d832eb9ce30fc99095dc863dfe84b6
-U drh
-Z fa1cdba8568610c894d1ce677cdd3927
+P 8a758a872175b0c74e631c231240c5c733fbec708d0cff23eb9c4025e4a800ec
+R bc7e7923bdbbf4167e1d0ea65b2cbd1a
+U dan
+Z 4710e29744ea4e9b01b11660462afc67
diff --git a/manifest.uuid b/manifest.uuid
index 2cdbb9977f..687004ba90 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8a758a872175b0c74e631c231240c5c733fbec708d0cff23eb9c4025e4a800ec
\ No newline at end of file
+8467c31aa0bf24e597f680748460a99f425c49f5ab741c3574c339aa56857146
\ No newline at end of file