From: dan <Dan Kennedy>
Date: Fri, 10 Jan 2025 18:03:48 +0000 (+0000)
Subject: Update log messages on this branch to say "v=22". Also add log message to slow calls... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fcf8f1552-commit-instr;p=thirdparty%2Fsqlite.git

Update log messages on this branch to say "v=22". Also add log message to slow calls to sqlite3_schema_copy().

FossilOrigin-Name: b0cd8dfcf92fffd939db7fc0e330c8a0bcef50baa6a8cdef1241be89aedcd919
---

diff --git a/manifest b/manifest
index b5f1b4babd..3132ae6066 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sexperimental\ssqlite3_schema_copy()\sAPI,\sfor\scopying\sschemas\sbetween\sdatabase\shandles.
-D 2025-01-10T17:36:51.356
+C Update\slog\smessages\son\sthis\sbranch\sto\ssay\s"v=22".\sAlso\sadd\slog\smessage\sto\sslow\scalls\sto\ssqlite3_schema_copy().
+D 2025-01-10T18:03:48.417
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -716,7 +716,7 @@ F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522
 F src/btree.c 2664c81f217a42afadc7c010bb4a175057d5e53b99e9512234eb74817f2ad59c
 F src/btree.h bdeeb35614caa33526b603138f04c8d07a3f90a1300b5ade76848b755edf2027
 F src/btreeInt.h caa893e74d2261fb0ff1681fce998533c0552858e882bd04fc6805075f5f6e75
-F src/build.c 5255fc726c9efb395a5c268ead0286fff6bc985d09555b714a9b6ac86e9cbd6c
+F src/build.c e5dfbf53622cda547fcc1d865e55267a579e26a0e445cfb615071125734d9400
 F src/callback.c 43c8ca52b1ecbdec43522f121126fd4e3ee10bc9ca01cdd3ae207cfa419780b6
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 193f6f9a75204274b7e7f45ac6d6517c12c70b55a5dfb39312dfc3a52e2a8138
@@ -849,7 +849,7 @@ F src/vdbe.c fa31aa6525e34b51763702d246a69c3877436f0bbf6be5f6351cdcb770b9b7ab
 F src/vdbe.h b74bfd9cb1fa895e545a5286ee1cac6d75f706d325f89be0e3bf3c5107eb8a78
 F src/vdbeInt.h 75373833a8178a78126625dda269bcd41db40547092114d1edff12e7bcbb1606
 F src/vdbeapi.c 80235ac380e9467fec1cb0883354d841f2a771976e766995f7e0c77f845406df
-F src/vdbeaux.c 38ccfb7b010bffa146b1248900201ad09f052a8b9ad879c7a6cccec43d7d1291
+F src/vdbeaux.c 8eb71ab07b186ab873a55a8b4fce711e1d3d8fca80a7c0d97dfd5622eab66cf9
 F src/vdbeblob.c 255be187436da38b01f276c02e6a08103489bbe2a7c6c21537b7aecbe0e1f797
 F src/vdbemem.c 831a244831eaa45335f9ae276b50a7a82ee10d8c46c2c72492d4eb8c98d94d89
 F src/vdbesort.c d0a3c7056c081703c8b6d91ad60f17da5e062a5c64bf568ed0fa1b5f4cae311f
@@ -2251,9 +2251,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 dc3a24a784c95398656e0d7885f7eb0ee626b86c896e759a6ac5c243fd6f0ab7 1d544b535f64c47d2133f72a738714e0448a803a95f65d2d880281a9e6d6bd35
-R 5422d8de312ca8c5b04252e37bd98630
-T +closed 1d544b535f64c47d2133f72a738714e0448a803a95f65d2d880281a9e6d6bd35
+P 04ea435d24a5a42046c6272b9f746529fa3da54944bdb9742c7ca88e25c479d8
+R 522bfdd028f42e050e540915eb8a04f2
 U dan
-Z a80666d158cbe74a499b5e042d9ecfea
+Z c41ed0664a1a70ddb31be0075c76d7c9
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index fd8236c01f..45c1c4fd8c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-04ea435d24a5a42046c6272b9f746529fa3da54944bdb9742c7ca88e25c479d8
+b0cd8dfcf92fffd939db7fc0e330c8a0bcef50baa6a8cdef1241be89aedcd919
diff --git a/src/build.c b/src/build.c
index 1949bb8bfa..4cb5e09ee7 100644
--- a/src/build.c
+++ b/src/build.c
@@ -6250,6 +6250,7 @@ int sqlite3_schema_copy(
   Schema *pTo = 0;
   Schema *pFrom = 0;
   int rc = SQLITE_OK;
+  u64 t = sqlite3STimeNow();
 
   sqlite3_mutex_enter(db->mutex);
   sqlite3BtreeEnterAll(db);
@@ -6273,6 +6274,11 @@ int sqlite3_schema_copy(
 
   sqlite3SchemaCopy(db, pTo, pFrom);
 
+  t = sqlite3STimeNow() - t;
+  if( t>500000 ){
+    sqlite3_log(SQLITE_WARNING, "slow schemacopy (v=22): (%lld)", t);
+  }
+
  schema_copy_done:
   sqlite3BtreeLeaveAll(db);
   rc = sqlite3ApiExit(db, rc);
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 45e33e096e..c14fb5458f 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=21): (%s)", zStr);
+    sqlite3_log(SQLITE_WARNING, "slow commit (v=22): (%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=21): (%s) [%.*s]", zStr, nByte, zSql
+        "slow prepare (v=22): (%s) [%.*s]", zStr, nByte, zSql
     );
     sqlite3_free(zStr);
   }
@@ -5548,7 +5548,7 @@ void sqlite3SchemaTimeLog(u64 *aSchema, const char *zFile){
       }
       zStr = sqlite3_mprintf("%z%s%d", zStr, (zStr?", ":""), val);
     }
-    sqlite3_log(SQLITE_WARNING, "slow schema (%s) (v=21): (%s)", zFile, zStr);
+    sqlite3_log(SQLITE_WARNING, "slow schema (%s) (v=22): (%s)", zFile, zStr);
     sqlite3_free(zStr);
   }
 }