From: dan <Dan Kennedy>
Date: Tue, 10 Dec 2024 14:56:20 +0000 (+0000)
Subject: Fix a problem with the formatting of "slow schema" log messages. Also change logging... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd4b7b5d7aa47e05b49abbd3014116921d2bcaef;p=thirdparty%2Fsqlite.git

Fix a problem with the formatting of "slow schema" log messages. Also change logging version to v=17.

FossilOrigin-Name: df4183ace93b788b798b258274bf6b651906c9f1cf2af4983e447cdf52904523
---

diff --git a/manifest b/manifest
index 5a9f0a3821..4124321135 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\snon-PASSIVE\swal2\scheckpoints\ssometimes\staking\sthe\sWRITER\slock.
-D 2024-12-09T21:26:21.182
+C Fix\sa\sproblem\swith\sthe\sformatting\sof\s"slow\sschema"\slog\smessages.\sAlso\schange\slogging\sversion\sto\sv=17.
+D 2024-12-10T14:56:20.988
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -849,7 +849,7 @@ F src/vdbe.c fa31aa6525e34b51763702d246a69c3877436f0bbf6be5f6351cdcb770b9b7ab
 F src/vdbe.h b74bfd9cb1fa895e545a5286ee1cac6d75f706d325f89be0e3bf3c5107eb8a78
 F src/vdbeInt.h 92b7eabbaadbe8127741cd96e7e39c4834c2bb0b75987d5f6251975f47233690
 F src/vdbeapi.c 80235ac380e9467fec1cb0883354d841f2a771976e766995f7e0c77f845406df
-F src/vdbeaux.c 92fc3d59a6f83ea73befe586d373d75db530ad41c29db66457b8dba99f127f4f
+F src/vdbeaux.c 6f2c4e262d124f3126a3fb865c09314ae825ffefc9eca140381584968502c989
 F src/vdbeblob.c 255be187436da38b01f276c02e6a08103489bbe2a7c6c21537b7aecbe0e1f797
 F src/vdbemem.c 831a244831eaa45335f9ae276b50a7a82ee10d8c46c2c72492d4eb8c98d94d89
 F src/vdbesort.c d0a3c7056c081703c8b6d91ad60f17da5e062a5c64bf568ed0fa1b5f4cae311f
@@ -2250,8 +2250,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 65b753735b8e8fb70d2b522d527426f1eb5c09339fb4b15cf69cbd2e595b160f
-R a34340bb9b605af414e2a372f2fb6d2a
+P 1a59cae3c31aea25cef3705cce2477e26515a0463cf9094bd29951899b758767
+R 0e3a507f138acab242e219ec9f3fad2f
 U dan
-Z 802a1f821ec59c877226c308eb1a6952
+Z df17b7a974fce400562bc6481f89f235
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1ea95eecf8..41451e3485 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1a59cae3c31aea25cef3705cce2477e26515a0463cf9094bd29951899b758767
+df4183ace93b788b798b258274bf6b651906c9f1cf2af4983e447cdf52904523
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index a8beab6fbe..c691d6ab9c 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -5499,7 +5499,7 @@ void sqlite3CommitTimeLog(u64 *aCommit){
       }
       zStr = sqlite3_mprintf("%z%s%s%d%s", zStr, (zStr?", ":""),zHash,iVal,zU);
     }
-    sqlite3_log(SQLITE_WARNING, "slow commit (v=16): (%s)", zStr);
+    sqlite3_log(SQLITE_WARNING, "slow commit (v=17): (%s)", zStr);
     sqlite3_free(zStr);
   }
 }
@@ -5527,7 +5527,7 @@ void sqlite3PrepareTimeLog(const char *zSql, int nSql, u64 *aPrepare){
     }
     if( nByte<0 ){ nByte = sqlite3Strlen30(zSql); }
     sqlite3_log(SQLITE_WARNING, 
-        "slow prepare (v=16): (%s) [%.*s]", zStr, nByte, zSql
+        "slow prepare (v=17): (%s) [%.*s]", zStr, nByte, zSql
     );
     sqlite3_free(zStr);
   }
@@ -5539,11 +5539,13 @@ void sqlite3SchemaTimeLog(u64 *aSchema, const char *zFile){
     char *zStr = 0;
     int ii;
     for(ii=1; ii<SCHEMA_TIME_N; ii++){
-      zStr = sqlite3_mprintf("%z%s%d", zStr, (zStr?", ":""), 
-        (aSchema[ii]==0 ? 0 : (int)(aSchema[ii] - i1))
-      );
+      int val = aSchema[ii];
+      if( val!=0 && ii!=SCHEMA_TIME_STAT4_Q1_BODY ){
+        val -= i1;
+      }
+      zStr = sqlite3_mprintf("%z%s%d", zStr, (zStr?", ":""), val);
     }
-    sqlite3_log(SQLITE_WARNING, "slow schema (%s) (v=16): (%s)", zFile, zStr);
+    sqlite3_log(SQLITE_WARNING, "slow schema (%s) (v=17): (%s)", zFile, zStr);
     sqlite3_free(zStr);
   }
 }