mirror of
https://github.com/openai/codex.git
synced 2026-10-29 00:06:55 +00:00
Adam Perry @ OpenAI
6bd3f5e3db
## What changed - Add `SqliteConfig` as the shared entry point for read-write and read-only SQLite pools. - Apply consistent WAL, synchronization, auto-vacuum, busy-timeout, logging, and pool-size settings to writable Codex databases. - Route state runtime, audit, CLI, and test database connections through the shared configuration. ## Testing - Run migration tests against temporary on-disk databases opened through `SqliteConfig`, including the concurrent-writer repair case. GitOrigin-RevId: e3946b98bde04c47574532ac8b1a7bb2b03edd97
71 lines
2.2 KiB
Rust
71 lines
2.2 KiB
Rust
//! Shared SQLite connection configuration.
|
|
|
|
use codex_utils_absolute_path::AbsolutePathBuf;
|
|
use log::LevelFilter;
|
|
use sqlx::ConnectOptions;
|
|
use sqlx::Error;
|
|
use sqlx::SqlitePool;
|
|
use sqlx::sqlite::SqliteAutoVacuum;
|
|
use sqlx::sqlite::SqliteConnectOptions;
|
|
use sqlx::sqlite::SqliteJournalMode;
|
|
use sqlx::sqlite::SqlitePoolOptions;
|
|
use sqlx::sqlite::SqliteSynchronous;
|
|
use std::path::Path;
|
|
use std::path::PathBuf;
|
|
use std::time::Duration;
|
|
|
|
/// Resolved configuration shared by all Codex SQLite connections.
|
|
#[derive(Clone, Debug, Eq, PartialEq)]
|
|
pub struct SqliteConfig {
|
|
sqlite_home: AbsolutePathBuf,
|
|
}
|
|
|
|
impl SqliteConfig {
|
|
pub fn from_sqlite_home(sqlite_home: AbsolutePathBuf) -> Self {
|
|
Self { sqlite_home }
|
|
}
|
|
|
|
#[expect(
|
|
clippy::expect_used,
|
|
reason = "test sqlite homes must already be absolute"
|
|
)]
|
|
pub fn new_for_testing(sqlite_home: PathBuf) -> Self {
|
|
Self::from_sqlite_home(
|
|
AbsolutePathBuf::try_from(sqlite_home).expect("sqlite home should be absolute"),
|
|
)
|
|
}
|
|
|
|
pub fn home(&self) -> &Path {
|
|
self.sqlite_home.as_path()
|
|
}
|
|
|
|
/// Open a writable Codex SQLite database, creating it if necessary.
|
|
pub async fn open_read_write_pool(&self, path: &Path) -> Result<SqlitePool, Error> {
|
|
let options = SqliteConnectOptions::new()
|
|
.filename(path)
|
|
.create_if_missing(true)
|
|
.journal_mode(SqliteJournalMode::Wal)
|
|
.synchronous(SqliteSynchronous::Normal)
|
|
.auto_vacuum(SqliteAutoVacuum::Incremental)
|
|
.busy_timeout(Duration::from_secs(5))
|
|
.log_statements(LevelFilter::Off);
|
|
SqlitePoolOptions::new()
|
|
.max_connections(5)
|
|
.connect_with(options)
|
|
.await
|
|
}
|
|
|
|
/// Open an existing Codex SQLite database without creating or modifying it.
|
|
pub async fn open_read_only_pool(&self, path: &Path) -> Result<SqlitePool, Error> {
|
|
let options = SqliteConnectOptions::new()
|
|
.filename(path)
|
|
.create_if_missing(false)
|
|
.read_only(true)
|
|
.log_statements(LevelFilter::Off);
|
|
SqlitePoolOptions::new()
|
|
.max_connections(1)
|
|
.connect_with(options)
|
|
.await
|
|
}
|
|
}
|