From: drh <>
Date: Fri, 13 Sep 2024 13:53:20 +0000 (+0000)
Subject: Improved informational output from sqlite3-rsync.
X-Git-Tag: version-3.47.0~118^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7316b6c0726e3fd4b41e70e4bf96d5950f46d045;p=thirdparty%2Fsqlite.git

Improved informational output from sqlite3-rsync.

FossilOrigin-Name: e55e3e8ec2fe3a9190872d999cee55c85bde92667040cc166233faaa2fa34266
---

diff --git a/manifest b/manifest
index bd0fbd3263..d2e70dbbfc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Preveious\scheck-in\swas\sactually\sdoing\san\s8-round\sKeccakF1600.\s\sThis\sone\ncorrects\sthat\sto\sjust\s6\srounds.
-D 2024-09-13T12:35:04.073
+C Improved\sinformational\soutput\sfrom\ssqlite3-rsync.
+D 2024-09-13T13:53:20.033
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -2174,7 +2174,7 @@ F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd
 F tool/spellsift.tcl 52b4b04dc4333c7ab024f09d9d66ed6b6f7c6eb00b38497a09f338fa55d40618 x
 F tool/split-sqlite3c.tcl 5aa60643afca558bc732b1444ae81a522326f91e1dc5665b369c54f09e20de60
 F tool/sqldiff.c 847fc8fcfddf5ce4797b7394cad6372f2f5dc17d8186e2ef8fb44d50fae4f44a
-F tool/sqlite3-rsync.c a8ae2390e6b78efda268ae97d2be0bf5a26d33777088a88b4e9e105e789f3141
+F tool/sqlite3-rsync.c 12b5d0f062496451c9e2a9c9d898ccb04fd90f3c2d309ebdd4e183bc516ad4c6
 F tool/sqlite3_analyzer.c.in 8da2b08f56eeac331a715036cf707cc20f879f231362be0c22efd682e2b89b4f
 F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaaef898
 F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848
@@ -2213,8 +2213,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 96c7f47a8f59e5078bd296979421c1b57fbcb7be261f8a7a0b1d22a4b5914db0
-R 642fdf901a5bf4deb3070404be191395
+P 3c36f5814f25483586c4fd49ef2fe5c7c0ff8c59672b1622c92061ec0ba8547a
+R 8cd1f423985f9cdd2c7d3914f9dc50f0
 U drh
-Z b81ca59094e5256917da50f121832a87
+Z 1cb8b10009d5db561201d72aab0227e3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4ea2ee2a9b..3ce2c13b08 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3c36f5814f25483586c4fd49ef2fe5c7c0ff8c59672b1622c92061ec0ba8547a
+e55e3e8ec2fe3a9190872d999cee55c85bde92667040cc166233faaa2fa34266
diff --git a/tool/sqlite3-rsync.c b/tool/sqlite3-rsync.c
index 305dc1519d..3b52da01e3 100644
--- a/tool/sqlite3-rsync.c
+++ b/tool/sqlite3-rsync.c
@@ -1697,7 +1697,14 @@ int main(int argc, char const * const *argv){
     }
     originSide(&ctx);
   }
-  if( ctx.eVerbose ){
+  if( ctx.nErr ){
+    printf("Databases where not synced due to errors\n");
+  }
+  if( ctx.eVerbose==1 ){
+    printf("Network traffic is %.1f%% of database size\n",
+           (100.0*(double)(ctx.nIn+ctx.nOut))/(ctx.szPage*(double)ctx.nPage));
+  }
+  if( ctx.eVerbose>=2 ){
     if( ctx.nErr ) printf("%d errors, ", ctx.nErr);
     printf("%lld bytes sent, %lld bytes received\n", ctx.nOut, ctx.nIn);
     if( ctx.eVerbose>=2 ){
@@ -1711,5 +1718,5 @@ int main(int argc, char const * const *argv){
   if( pIn!=0 && pOut!=0 ){
     pclose2(pIn, pOut, childPid);
   }
-  return 0;
+  return ctx.nErr;
 }