Merge branch 'main' into chirag-skipQueryLog

Expensify · Jun 7, 2024 · 0736d50 · 0736d50
2 parents 3270418 + b2adefe
commit 0736d50
Show file tree

Hide file tree

Showing 7 changed files with 398 additions and 177 deletions.
diff --git a/.github/workflows/bedrock.yml b/.github/workflows/bedrock.yml
@@ -4,7 +4,7 @@ on:
     branches: # this ignores tag pushes, and only looks at branches.
       - '**'
   release:
-    types: [prereleased]
+    types: [prereleased, published]
 concurrency:
   group: "${{ github.ref }}"
   cancel-in-progress: true

diff --git a/BedrockServer.cpp b/BedrockServer.cpp
@@ -86,13 +86,18 @@ void BedrockServer::sync()
         workerThreads = 2;
     }
 
+    size_t journalTables = workerThreads;
+    if (args.isSet("-journalTables")) {
+        journalTables = args.calcU64("-journalTables");
+    }
+
     // Initialize the DB.
     int64_t mmapSizeGB = args.isSet("-mmapSizeGB") ? stoll(args["-mmapSizeGB"]) : 0;
 
     // We use fewer FDs on test machines that have other resource restrictions in place.
 
     SINFO("Setting dbPool size to: " << _dbPoolSize);
-    _dbPool = make_shared<SQLitePool>(_dbPoolSize, args["-db"], args.calc("-cacheSize"), args.calc("-maxJournalSize"), workerThreads, args["-synchronous"], mmapSizeGB, args.isSet("-hctree"));
+    _dbPool = make_shared<SQLitePool>(_dbPoolSize, args["-db"], args.calc("-cacheSize"), args.calc("-maxJournalSize"), journalTables, args["-synchronous"], mmapSizeGB, args.isSet("-hctree"));
     SQLite& db = _dbPool->getBase();
 
     // Initialize the command processor.