[codex] Recover live graph refresh after DB contention

.github/workflows/ci.yml

@@ -43,14 +43,17 @@ jobs:
             rustflags: ""
             prebuilt_lbug: false
             lbug_archive: ""
+            test_args: ""
           - os: macos-latest
             rustflags: ""
             prebuilt_lbug: true
             lbug_archive: liblbug-static-osx-arm64.tar.gz
+            test_args: ""
           - os: windows-2022
             rustflags: ""
             prebuilt_lbug: false
             lbug_archive: ""
+            test_args: "--release"
     steps:
       - name: Check out repository
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
@@ -78,7 +81,7 @@ jobs:
       - name: Run tests
         env:
           RUSTFLAGS: ${{ matrix.rustflags }}
-        run: cargo test --workspace --locked
+        run: cargo test --workspace --locked ${{ matrix.test_args }}
 
   clippy:
     name: cargo clippy

src/cli/build/command.rs

@@ -105,15 +105,21 @@ fn write_materialized_database(
     } else {
         request.schema_statements.clone()
     };
+    let mut delete_statements = crate::db_writer::partition_delete_statements(
+        request.previous_manifest.as_ref(),
+        &response.diff,
+    );
+    delete_statements.extend(crate::db_writer::incoming_row_delete_statements(
+        request.previous_manifest.as_ref(),
+        &response.diff,
+        &response.rebuilt_entries,
+    ));
     write_database(LadybugWriteRequest {
         db_path: request.db_path.clone(),
         include_fts: request.include_fts,
         schema_statements,
         replace_database: response.diff.force_rebuild,
-        delete_statements: crate::db_writer::partition_delete_statements(
-            request.previous_manifest.as_ref(),
-            &response.diff,
-        ),
+        delete_statements,
         copy_statements: response.copy_statements.clone(),
     })
     .map_err(|error| error.to_string())

src/cli/build/request.rs

@@ -210,7 +210,7 @@ pub(in crate::cli) fn default_excluded_parts() -> Vec<String> {
     .collect()
 }
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub(in crate::cli) struct MaterializeOptions {
     pub(in crate::cli) native_request: Option<PathBuf>,
     pub(in crate::cli) source_root: Option<PathBuf>,

src/cli/graph/health.rs

@@ -3,7 +3,10 @@ use crate::cli::{
     setup::GraphStatePaths,
     util::{read_json_file, resolve_repo_root},
 };
-use lbug::{Connection, Database, SystemConfig, Value};
+use crate::db_writer::{
+    connect_ladybug_database, open_ladybug_database, retry_transient_database, READ_RETRY_POLICY,
+};
+use lbug::Value;
 use std::path::{Path, PathBuf};
 
 #[derive(Debug)]
@@ -56,14 +59,9 @@ pub(in crate::cli) fn resolve_health_runtime(
     })
 }
 pub(in crate::cli) fn count_graph_nodes(db_path: &Path) -> Result<u64, String> {
-    let db = Database::new(db_path, SystemConfig::default().read_only(true)).map_err(|error| {
-        format!(
-            "failed to open graph database {}: {error}",
-            db_path.display()
-        )
-    })?;
-    let conn =
-        Connection::new(&db).map_err(|error| format!("failed to connect to graph: {error}"))?;
+    let db = retry_transient_database(READ_RETRY_POLICY, || open_ladybug_database(db_path, true))
+        .map_err(|error| error.to_string())?;
+    let conn = connect_ladybug_database(&db).map_err(|error| error.to_string())?;
     let mut result = conn
         .query("MATCH (n) RETURN count(n) AS total_nodes LIMIT 1")
         .map_err(|error| format!("failed to query graph health: {error}"))?;

src/cli/graph/query.rs

@@ -1,4 +1,7 @@
-use lbug::{Connection, Database, SystemConfig, Value};
+use crate::db_writer::{
+    connect_ladybug_database, open_ladybug_database, retry_transient_database, READ_RETRY_POLICY,
+};
+use lbug::Value;
 use serde_json::json;
 use std::path::Path;
 
@@ -114,14 +117,9 @@ pub(in crate::cli) fn execute_read_only_query(
     parameters: &serde_json::Map<String, serde_json::Value>,
     limit: usize,
 ) -> Result<(Vec<Vec<serde_json::Value>>, bool), String> {
-    let db = Database::new(db_path, SystemConfig::default().read_only(true)).map_err(|error| {
-        format!(
-            "failed to open graph database {}: {error}",
-            db_path.display()
-        )
-    })?;
-    let conn =
-        Connection::new(&db).map_err(|error| format!("failed to connect to graph: {error}"))?;
+    let db = retry_transient_database(READ_RETRY_POLICY, || open_ladybug_database(db_path, true))
+        .map_err(|error| error.to_string())?;
+    let conn = connect_ladybug_database(&db).map_err(|error| error.to_string())?;
     let mut result = if parameters.is_empty() {
         conn.query(statement)
             .map_err(|error| format!("failed to execute graph query: {error}"))?