Merge pull request #2536 from Expensify/main

Update expensify_prod branch

Author: tgolen

libstuff/sqlite3.c

@@ -18,7 +18,7 @@
 ** separate file. This file contains only code for the core SQLite library.
 **
 ** The content in this amalgamation comes from Fossil check-in
-** 1f0cf66a7851fdb878e3d8cac13c5baba3d7 with changes in files:
+** e3af311bdeb6d86480858e5084471807ec71 with changes in files:
 **
 **    
 */
@@ -476,10 +476,10 @@ extern "C" {
 */
 #define SQLITE_VERSION        "3.52.0"
 #define SQLITE_VERSION_NUMBER 3052000
-#define SQLITE_SOURCE_ID      "2026-02-13 11:07:58 1f0cf66a7851fdb878e3d8cac13c5baba3d7c73212ea8f1a19c2f6cbccfb9e9f"
+#define SQLITE_SOURCE_ID      "2026-03-04 19:30:52 e3af311bdeb6d86480858e5084471807ec714a9f193c7bef10f0cc82f3e2d471"
 #define SQLITE_SCM_BRANCH     "hctree-bedrock"
 #define SQLITE_SCM_TAGS       ""
-#define SQLITE_SCM_DATETIME   "2026-02-13T11:07:58.070Z"
+#define SQLITE_SCM_DATETIME   "2026-03-04T19:30:52.802Z"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -25293,7 +25293,7 @@ SQLITE_API int sqlite3_db_status64(
       sqlite3BtreeEnterAll(db);
       for(i=0; i<db->nDb; i++){
         Btree *pBt = db->aDb[i].pBt;
-        if( pBt ){
+        if( pBt && 0==sqlite3IsHct(pBt) ){
           Pager *pPager = sqlite3BtreePager(pBt);
           int nByte = sqlite3PagerMemUsed(pPager);
           if( op==SQLITE_DBSTATUS_CACHE_USED_SHARED ){
@@ -89599,8 +89599,8 @@ struct HBtree {
   HctMainStats stats;
 
 #ifdef HCT_ENABLE_COMMIT_TIMERS
-  i64 aCommitTimer[HCT_COMMIT_N_TIMER];
   i64 iCommitHwTime;
+  i64 iCommitUsTime;
   HctMainStats savedstats;
   struct rusage savedusage;
 #endif
@@ -89621,16 +89621,8 @@ static i64 hctDbGetUs(){
   return ((i64)tv.tv_sec * 1000000 + (i64)tv.tv_usec);
 }
 
-#define HCT_COMMIT_START              0
-#define HCT_COMMIT_AFTER_TREE_RELEASE 1
-#define HCT_COMMIT_AFTER_WRITE_LOG    2
-#define HCT_COMMIT_AFTER_FLUSH_DATA   3
-#define HCT_COMMIT_AFTER_VALIDATION   4
-#define HCT_COMMIT_AFTER_ZERO_LOG     5
-#define HCT_COMMIT_AFTER_TREE_CLEAR   6
-#define HCT_COMMIT_AFTER_END_READ     7
-
-SQLITE_PRIVATE sqlite_uint64 sqlite3Hwtime(void);
+SQLITE_PRIVATE sqlite3_uint64 sqlite3Hwtime(void);
+# ifdef SQLITE_AMALGAMATION
 /************** Include hwtime.h in the middle of hctree.c *******************/
 /************** Begin file hwtime.h ******************************************/
 /*
@@ -89720,14 +89712,15 @@ SQLITE_PRIVATE   sqlite_uint64 sqlite3Hwtime(void){ return ((sqlite_uint64)0); }
 
 /************** End of hwtime.h **********************************************/
 /************** Continuing where we left off in hctree.c *********************/
+# endif
 
 /*
 ** Save statistics in case this is a slow commit.
 */
 static void hctCommitTimerSaveStats(HBtree *p){
-  memset(p->aCommitTimer, 0, sizeof(i64) * HCT_COMMIT_N_TIMER);
   p->savedstats = p->stats;
   p->iCommitHwTime = sqlite3Hwtime();
+  p->iCommitUsTime = hctDbGetUs();
   if( p->pHctDb ){
     sqlite3HctDbSaveStats(p->pHctDb);
     sqlite3HctFileSaveStats(sqlite3HctDbFile(p->pHctDb));
@@ -89740,10 +89733,9 @@ static i64 hctTimevalDiff(struct timeval *p1, struct timeval *p2){
 }
 
 static void hctCommitTimerLog(HBtree *p){
-  i64 *aTimer = p->aCommitTimer;
-  if( aTimer[0] ){
-    i64 nUs = aTimer[HCT_COMMIT_N_TIMER-1] - aTimer[0];
-    if( nUs>HCT_COMMIT_TIMER_THRESHOLD_US ){
+  if( p->iCommitHwTime ){
+    i64 iNow = hctDbGetUs();
+    if( (iNow - p->iCommitUsTime)>HCT_COMMIT_TIMER_THRESHOLD_US ){
       char *zMainStats = 0;
       char *zDbStats = 0;
       char *zFileStats = 0;
@@ -89779,17 +89771,10 @@ static void hctCommitTimerLog(HBtree *p){
       );
 
       sqlite3_log(SQLITE_WARNING,
-          "hctree: slow commit v3: hwtime=%lld"
-          "(%lld, %lld, %lld, %lld, %lld, %lld, %lld) "
+          "hctree: slow commit v3: ms=%lld hwtime=%lld"
           "(%s %s %s) [%s]",
+          (iNow - p->iCommitUsTime),
           iHwTime,
-          (aTimer[1] ? (aTimer[1] - aTimer[0]) : 0),
-          (aTimer[2] ? (aTimer[2] - aTimer[0]) : 0),
-          (aTimer[3] ? (aTimer[3] - aTimer[0]) : 0),
-          (aTimer[4] ? (aTimer[4] - aTimer[0]) : 0),
-          (aTimer[5] ? (aTimer[5] - aTimer[0]) : 0),
-          (aTimer[6] ? (aTimer[6] - aTimer[0]) : 0),
-          (aTimer[7] ? (aTimer[7] - aTimer[0]) : 0),
           zMainStats,
           zDbStats,
           zFileStats,
@@ -89804,14 +89789,9 @@ static void hctCommitTimerLog(HBtree *p){
   }
 }
 
-static void hctCommitTimerSet(i64 *aTimer, int eTimer){
-  aTimer[eTimer] = hctDbGetUs();
-}
-
 #else /* HCT_ENABLE_COMMIT_TIMERS */
 # define hctCommitTimerSaveStats(p)
 # define hctCommitTimerLog(p)
-# define hctCommitTimerSet(aTimer, eTimer)
 #endif
 
 
@@ -91481,17 +91461,13 @@ static int btreeFlushToDisk(HBtree *p){
     }
   }
 
-  hctCommitTimerSet(p->aCommitTimer, HCT_COMMIT_AFTER_WRITE_LOG);
-
   /* Write all the new database entries to the database. Any write/write
   ** conflicts are detected here - SQLITE_BUSY is returned in that case.  */
   p->nRollbackOp = 0;
   if( rc==SQLITE_OK ){
     rc = btreeFlushData(p, 0);
   }
 
-  hctCommitTimerSet(p->aCommitTimer, HCT_COMMIT_AFTER_FLUSH_DATA);
-
   /* Assuming the data has been flushed to disk without error or a
   ** write/write conflict, allocate a CID and validate the transaction. */
   if( rc==SQLITE_OK ){
@@ -91537,8 +91513,6 @@ static int btreeFlushToDisk(HBtree *p){
     }
   }
 
-  hctCommitTimerSet(p->aCommitTimer, HCT_COMMIT_AFTER_VALIDATION);
-
   /* If conflicts have been detected, roll back the transaction */
   assert( rc!=SQLITE_BUSY );
   if( rc==SQLITE_BUSY_SNAPSHOT ){
@@ -91568,8 +91542,6 @@ static int btreeFlushToDisk(HBtree *p){
   }
   sqlite3HctDbTMapScan(p->pHctDb);
 
-  hctCommitTimerSet(p->aCommitTimer, HCT_COMMIT_AFTER_ZERO_LOG);
-
   return (rc==SQLITE_OK ? rcok : rc);
 }
 
@@ -91677,16 +91649,13 @@ static int hctreeRollbackSchema(HBtree *p, int iSavepoint){
 */
 SQLITE_PRIVATE int sqlite3HctBtreeCommitPhaseTwo(Btree *pBt, int bCleanup){
   HBtree *const p = (HBtree*)pBt;
-  const i64 nKeyOp = p->stats.nKeyOp;
   int rc = SQLITE_OK;
 
   if( p->eTrans==SQLITE_TXN_ERROR ) return SQLITE_BUSY_SNAPSHOT;
 
   hctCommitTimerSaveStats(p);
   if( p->eTrans==SQLITE_TXN_WRITE ){
 
-    hctCommitTimerSet(p->aCommitTimer, HCT_COMMIT_START);
-
     if( sqlite3HctJrnlCommitOk(p->pHctJrnl)==0 ){
       /* This case is when a straight COMMIT is run in FOLLOWER or
       ** LEADER mode. */
@@ -91705,7 +91674,6 @@ SQLITE_PRIVATE int sqlite3HctBtreeCommitPhaseTwo(Btree *pBt, int bCleanup){
 
       /* Do the equivalent of RELEASE on any existing savepoints. */
       sqlite3HctTreeRelease(p->pHctTree, 0);
-      hctCommitTimerSet(p->aCommitTimer, HCT_COMMIT_AFTER_TREE_RELEASE);
 
       if( p->pHctDb ){
         rc = btreeFlushToDisk(p);
@@ -91716,13 +91684,11 @@ SQLITE_PRIVATE int sqlite3HctBtreeCommitPhaseTwo(Btree *pBt, int bCleanup){
         p->nSchemaOp = 0;
       }
       p->eTrans = SQLITE_TXN_READ;
-      hctCommitTimerSet(p->aCommitTimer, HCT_COMMIT_AFTER_TREE_CLEAR);
     }
   }
 
   if( rc==SQLITE_OK ){
     hctEndTransaction(p);
-    hctCommitTimerSet(p->aCommitTimer, HCT_COMMIT_AFTER_END_READ);
     hctCommitTimerLog(p);
   }else{
     p->eTrans = SQLITE_TXN_ERROR;
@@ -270488,7 +270454,7 @@ static void fts5SourceIdFunc(
 ){
   assert( nArg==0 );
   UNUSED_PARAM2(nArg, apUnused);
-  sqlite3_result_text(pCtx, "fts5: 2026-02-13 11:07:58 1f0cf66a7851fdb878e3d8cac13c5baba3d7c73212ea8f1a19c2f6cbccfb9e9f", -1, SQLITE_TRANSIENT);
+  sqlite3_result_text(pCtx, "fts5: 2026-03-04 19:30:52 e3af311bdeb6d86480858e5084471807ec714a9f193c7bef10f0cc82f3e2d471", -1, SQLITE_TRANSIENT);
 }
 
 /*
@@ -276116,6 +276082,8 @@ struct HctPManFreePg {
   i64 iTid;                       /* TID of transaction that freed page */
 };
 
+#define PAGESET_FREEPGSET_MAX (4*1024)
+
 struct HctPManFreePgSet {
   HctPManFreePg *aPg;             /* Page buffer */
   int nAlloc;                     /* Allocated size of aPg[] */
@@ -276622,8 +276590,12 @@ static int hctPManMakeSpace(
   int rc = SQLITE_OK;
   HctPManFreePgSet *pSet = &pClient->aPgSet[bLogical];
 
+  if( pSet->nPg>=PAGESET_FREEPGSET_MAX ){
+    hctPManHandback(pClient, bLogical, pClient->aPgSet[bLogical].nPg);
+  }
+
   if( (pSet->nAlloc-pSet->nPg)<nPg ){
-    int nNew = pSet->nPg + nPg;
+    int nNew = pSet->nPg + MAX(nPg, 1024);
     int nByte = nNew * sizeof(HctPManFreePg);
     HctPManFreePg *aNew = (HctPManFreePg*)sqlite3_realloc(pSet->aPg, nByte);
 
@@ -278911,6 +278883,8 @@ struct HctFileStats {
   i64 nIncrFail;
   i64 nMutex;
   i64 nMutexBlock;
+  i64 nGetPage;
+  i64 nGetPhysical;
 };
 
 /*
@@ -278944,6 +278918,7 @@ struct HctFile {
   /* Event counters used by the hctstats virtual table */
   HctFileStats stats;
   HctFileStats savedstats;
+  u64 nSavedPageAlloc;
 };
 
 static int hctLog2(int n){
@@ -280253,14 +280228,6 @@ static int hctFilePagemapGetGrow32(HctFile *pFile, u32 iSlot, u32 *piVal){
 }
 
 
-static int hctFilePagemapPtr(HctFile *pFile, u32 iPg, u8 **paData){
-  int rc = hctFileGrowMapping(pFile, 1+(iPg>>pFile->pMapping->mapShift));
-  if( rc==SQLITE_OK ){
-    *paData = hctPagePtr(pFile->pMapping, iPg);
-  }
-  return rc;
-}
-
 #define HCT_GROW_MAPPING(iPg) {                              \
   int iGrowMappingChunk = (iPg >> pMapping->mapShift);       \
   if( iGrowMappingChunk>=pMapping->nChunk ){                 \
@@ -280272,6 +280239,7 @@ static int hctFilePagemapPtr(HctFile *pFile, u32 iPg, u8 **paData){
 
 SQLITE_PRIVATE int sqlite3HctFilePageGet(HctFile *pFile, u32 iPg, HctFilePage *pPg){
   int rc;
+  pFile->stats.nGetPage++;
   memset(pPg, 0, sizeof(*pPg));
   if( inject_page_failure() ){
     rc = SQLITE_IOERR_READ;
@@ -280302,6 +280270,7 @@ SQLITE_PRIVATE u32 sqlite3HctFilePageMapping(HctFile *pFile, u32 iLogical, int *
 */
 SQLITE_PRIVATE int sqlite3HctFilePageGetPhysical(HctFile *pFile, u32 iPg, HctFilePage *pPg){
   int rc;
+  pFile->stats.nGetPhysical++;
   memset(pPg, 0, sizeof(*pPg));
   if( inject_page_failure() ){
     rc = SQLITE_IOERR_READ;
@@ -281055,6 +281024,7 @@ SQLITE_PRIVATE i64 sqlite3HctFileStats(sqlite3 *db, int iStat, const char **pzSt
 }
 SQLITE_PRIVATE void sqlite3HctFileSaveStats(HctFile *pFile){
   pFile->savedstats = pFile->stats;
+  pFile->nSavedPageAlloc = pFile->nPageAlloc;
 }
 
 /*
@@ -281066,13 +281036,17 @@ SQLITE_PRIVATE char *sqlite3HctFileStatsString(HctFile *pFile){
   return sqlite3HctMprintf(
       "cas_attempt=%lld cas_fail=%lld "
       "incr_attempt=%lld incr_fail=%lld "
-      "mutex=%lld mutex_block=%lld",
+      "mutex=%lld mutex_block=%lld "
+      "nPageAlloc=%lld nGetPage=%lld nGetPhysical=%lld",
       pFile->stats.nCasAttempt - pFile->savedstats.nCasAttempt,
       pFile->stats.nCasFail - pFile->savedstats.nCasFail,
       pFile->stats.nIncrAttempt - pFile->savedstats.nIncrAttempt,
       pFile->stats.nIncrFail - pFile->savedstats.nIncrFail,
       pFile->stats.nMutex - pFile->savedstats.nMutex,
-      pFile->stats.nMutexBlock - pFile->savedstats.nMutexBlock
+      pFile->stats.nMutexBlock - pFile->savedstats.nMutexBlock,
+      pFile->nPageAlloc - pFile->nSavedPageAlloc,
+      pFile->stats.nGetPage - pFile->savedstats.nGetPage,
+      pFile->stats.nGetPhysical - pFile->savedstats.nGetPhysical
   );
 }
 

libstuff/sqlite3.h

@@ -148,10 +148,10 @@ extern "C" {
 */
 #define SQLITE_VERSION        "3.52.0"
 #define SQLITE_VERSION_NUMBER 3052000
-#define SQLITE_SOURCE_ID      "2026-02-13 11:07:58 1f0cf66a7851fdb878e3d8cac13c5baba3d7c73212ea8f1a19c2f6cbccfb9e9f"
+#define SQLITE_SOURCE_ID      "2026-03-04 19:30:52 e3af311bdeb6d86480858e5084471807ec714a9f193c7bef10f0cc82f3e2d471"
 #define SQLITE_SCM_BRANCH     "hctree-bedrock"
 #define SQLITE_SCM_TAGS       ""
-#define SQLITE_SCM_DATETIME   "2026-02-13T11:07:58.070Z"
+#define SQLITE_SCM_DATETIME   "2026-03-04T19:30:52.802Z"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers

libstuff/sqlite3ext.h

@@ -374,6 +374,7 @@ struct sqlite3_api_routines {
   /* Version 3.52.0 and later */
   void (*str_truncate)(sqlite3_str*,int);
   void (*str_free)(sqlite3_str*);
+  int (*carray_bind)(sqlite3_stmt*,int,void*,int,int,void(*)(void*));
 };
 
 /*
@@ -715,6 +716,7 @@ typedef int (*sqlite3_loadext_entry)(
 /* Version 3.52.0 and later */
 #define sqlite3_str_truncate           sqlite3_api->str_truncate
 #define sqlite3_str_free               sqlite3_api->str_free
+#define sqlite3_carray_bind            sqlite3_api->carray_bind
 #endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
 
 #if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)