Move SQLite orchestration into trailbase-sqlite and fix js-runtime completion bug with true async (previously libsql was sync under the hood).

Author: ignatz

.gitmodules

@@ -7,9 +7,6 @@
 [submodule "vendor/sqlean/bundled/sqlean"]
 	path = vendor/sqlean/bundled/sqlean
 	url = https://github.com/trailbaseio/sqlean
-[submodule "vendor/tokio-rusqlite"]
-	path = vendor/tokio-rusqlite
-	url = https://github.com/trailbaseio/tokio-rusqlite.git
 [submodule "vendor/serde_rusqlite"]
 	path = vendor/serde_rusqlite
 	url = https://github.com/trailbaseio/serde_rusqlite.git

Cargo.lock

@@ -7,7 +7,6 @@ members = [
   "trailbase-extension",
   "trailbase-sqlite",
   "vendor/sqlean",
-  "vendor/tokio-rusqlite",
 ]
 default-members = [
   "trailbase-cli",
@@ -41,6 +40,4 @@ rusqlite = { version = "^0.32.1", default-features = false, features = [
     "limits",
     "backup",
 ] }
-serde_rusqlite = { package = "serde_rusqlite", path = "./vendor/serde_rusqlite" }
 sqlite-loadable = { package = "sqlite-loadable", path = "./vendor/sqlite-loadable", features=["static"]  }
-tokio-rusqlite = { package = "tokio-rusqlite", path = "./vendor/tokio-rusqlite" }

Cargo.toml

@@ -1,6 +1,6 @@
 default: format check
 
-target/x86_64-unknown-linux-gnu/release/trail:
+static:
 	RUSTFLAGS="-C target-feature=+crt-static" cargo build --target x86_64-unknown-linux-gnu --release --bin trail
 
 format:
@@ -21,4 +21,4 @@ check:
 docker:
 	docker build . -t trailbase/trailbase
 
-.PHONY: default format check
+.PHONY: default format check static

Makefile

@@ -148,7 +148,7 @@ export function Duration100kInsertsChartMoreResults() {
 
 export function PocketBaseAndTrailBaseReadLatencies() {
   // 2024-10-12
-  // Read 1000000 messages, took 0:00:57.952120 (limit=64)
+  // TB: Read 1 000 000 messages, took 0:00:57.952120 (limit=64)
   const readTrailbaseMicroS = {
     p50: 3504,
     p75: 3947,
@@ -157,7 +157,7 @@ export function PocketBaseAndTrailBaseReadLatencies() {
   };
 
   // 2024-10-12
-  // Read 100000 messages, took 0:00:20.273054 (limit=64)
+  // PB: Read 100 000 messages, took 0:00:20.273054 (limit=64)
   const readPocketbaseMicroS = {
     p50: 12740,
     p75: 13718,

docs/src/content/docs/reference/_benchmarks/benchmarks.tsx

@@ -1,9 +1,12 @@
-all: init app
+build_n_data: build data_init
 
-app: dist
-	pnpm build
+build: dist
+	rm -rf dist && pnpm build
 
-init:
+data_init:
 	rm -rf traildepot/data && mkdir -p traildepot/data && cat import.sql | sqlite3 traildepot/data/main.db -
 
+run:
+	cargo run -- run --public-dir dist
+
 .PHONY: init

examples/coffeesearch/Makefile

@@ -16,12 +16,12 @@ chrono = "^0.4.38"
 clap = { version = "^4.4.11", features=["derive", "env"] }
 env_logger = "^0.11.3"
 trailbase-core = { path = "../trailbase-core" }
+trailbase-sqlite = { path = "../trailbase-sqlite" }
 log = "^0.4.21"
 mimalloc = { version = "^0.1.41", default-features = false }
 serde = { version = "^1.0.203", features = ["derive"] }
 serde_json = "^1.0.117"
 tokio = { version = "^1.38.0", features=["macros", "rt-multi-thread", "fs", "signal"] }
-tokio-rusqlite = { workspace = true }
 tracing-subscriber = "0.3.18"
 utoipa = { version = "5.0.0-beta.0", features = ["axum_extras"], optional = true }
 utoipa-swagger-ui = { version = "8.0.1", features = ["axum"], optional = true }

trailbase-cli/Cargo.toml

@@ -54,7 +54,7 @@ impl DbUser {
 }
 
 async fn get_user_by_email(
-  conn: &tokio_rusqlite::Connection,
+  conn: &trailbase_sqlite::Connection,
   email: &str,
 ) -> Result<DbUser, BoxError> {
   if let Some(user) = conn
@@ -158,7 +158,7 @@ async fn async_main() -> Result<(), BoxError> {
     Some(SubCommands::Schema(cmd)) => {
       init_logger(false);
 
-      let conn = tokio_rusqlite::Connection::from_conn(api::connect_sqlite(
+      let conn = trailbase_sqlite::Connection::from_conn(api::connect_sqlite(
         Some(data_dir.main_db_path()),
         None,
       )?)
@@ -202,7 +202,7 @@ async fn async_main() -> Result<(), BoxError> {
     Some(SubCommands::Admin { cmd }) => {
       init_logger(false);
 
-      let conn = tokio_rusqlite::Connection::from_conn(api::connect_sqlite(
+      let conn = trailbase_sqlite::Connection::from_conn(api::connect_sqlite(
         Some(data_dir.main_db_path()),
         None,
       )?)
@@ -257,7 +257,7 @@ async fn async_main() -> Result<(), BoxError> {
       init_logger(false);
 
       let data_dir = DataDir(args.data_dir);
-      let conn = tokio_rusqlite::Connection::from_conn(api::connect_sqlite(
+      let conn = trailbase_sqlite::Connection::from_conn(api::connect_sqlite(
         Some(data_dir.main_db_path()),
         None,
       )?)

trailbase-cli/src/bin/trail.rs

@@ -60,7 +60,6 @@ sqlite3-parser = "0.13.0"
 thiserror = "2.0.1"
 thread_local = "1.1.8"
 tokio = { version = "^1.38.0", features=["macros", "rt-multi-thread", "fs", "signal", "time"] }
-tokio-rusqlite = { workspace = true }
 tower-cookies = { version = "0.10.0" }
 tower-http = { version = "^0.6.0", features=["cors", "trace", "fs", "limit"] }
 tower-service = "0.3.3"

trailbase-core/Cargo.toml

@@ -7,7 +7,7 @@ use thiserror::Error;
 #[derive(Debug, Error)]
 pub enum AdminError {
   #[error("TokioRusqlite error: {0}")]
-  TokioRusqlite(#[from] tokio_rusqlite::Error),
+  TokioRusqlite(#[from] trailbase_sqlite::Error),
   #[error("Rusqlite error: {0}")]
   Rusqlite(#[from] rusqlite::Error),
   #[error("Rusqlite FromSql error: {0}")]