dirsql 0.4.124__tar.gz → 0.4.125__tar.gz

{dirsql-0.4.124 → dirsql-0.4.125}/Cargo.lock

@@ -573,7 +573,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql"
-version = "0.4.124"
+version = "0.4.125"
 dependencies = [
  "assert_cmd",
  "axum",
@@ -625,7 +625,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql-py-ext"
-version = "0.4.124"
+version = "0.4.125"
 dependencies = [
  "dirsql",
  "pyo3",

{dirsql-0.4.124 → dirsql-0.4.125}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirsql
-Version: 0.4.124
+Version: 0.4.125
 Requires-Dist: bin-shim>=0.1
 Summary: Ephemeral SQL index over a local directory
 Keywords: sql,filesystem,directory,sqlite,index

{dirsql-0.4.124 → dirsql-0.4.125}/packages/python/Cargo.toml

@@ -4,7 +4,7 @@ name = "dirsql-py-ext"
 # pypi/maturin handler can rewrite it via `write-version` before
 # `maturin build`. `pyproject.toml` declares `dynamic = ["version"]`
 # and maturin reads this field. Mirrors `packages/rust/Cargo.toml`.
-version = "0.4.124"
+version = "0.4.125"
 # abi3 note: the `abi3-py310` pyo3 feature (below) builds ONE stable-ABI
 # `cp310-abi3` wheel per platform that loads on every CPython >= 3.10
 # (matching `pyproject.toml`'s `requires-python = ">=3.10"`), instead of

dirsql-0.4.125/packages/python/e2e-attestations/bot-1562-watch-speed-1102.json

@@ -0,0 +1,7 @@
+{
+  "command": "uv run python -m pytest tests/e2e/on_file_query_test.py tests/e2e/query_contract_test.py tests/e2e/declared_table_name_test.py tests/e2e/fanout_test.py tests/e2e/use_case_dossier_test.py tests/e2e/use_case_join_test.py tests/e2e/use_case_notebook_test.py tests/e2e/use_case_transcripts_test.py tests/e2e/watch_speed_test.py -q -p no:cacheprovider",
+  "ran_at": 1793662313,
+  "exit_code": 0,
+  "commit": "900d89821767c1af609f1c1b2f21bf87c97c2332",
+  "branch": "bot/1562-watch-speed-1102"
+}

{dirsql-0.4.124 → dirsql-0.4.125}/packages/rust/Cargo.toml

@@ -6,7 +6,7 @@ description = "Ephemeral SQL index over a local directory"
 # version stays for the binding crates (publish = false). The literal
 # intentionally lags the published version: putitoutthere rewrites it to
 # the planned release version at build time and never commits it back.
-version = "0.4.124"
+version = "0.4.125"
 edition.workspace = true
 # Literal `license` (not `license.workspace = true`) because
 # putitoutthere's preflight check reads `[package].license` directly

{dirsql-0.4.124 → dirsql-0.4.125}/packages/rust/src/db.rs

@@ -1,5 +1,6 @@
 use rusqlite::Connection;
 use rusqlite::types::{ToSql, ToSqlOutput, ValueRef};
+use std::cell::RefCell;
 use std::collections::{HashMap, HashSet};
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
@@ -468,8 +469,15 @@ pub struct Db {
     /// The declared functions that batch. Every statement opens a collect
     /// pass on each of them; empty, a statement runs exactly once.
     batched: Vec<Arc<Worker>>,
+    /// Each table's key candidates (see [`Self::row_key`]) as of a schema
+    /// version: reading them takes three pragma queries, and a watched
+    /// change would otherwise pay for them every time.
+    keys: RefCell<HashMap<String, (i64, KeyCandidates)>>,
 }
 
+/// A table's `PRIMARY KEY` column names, then each plain `UNIQUE` index's.
+type KeyCandidates = Vec<Vec<Option<String>>>;
+
 /// Drops every batching worker's gathered replies when the statement that
 /// gathered them is done, whichever way it left.
 struct ClearOnDrop<'a>(&'a [Arc<Worker>]);
@@ -521,6 +529,7 @@ impl Db {
             path_table_parser: None,
             calls: CallReporter::new(),
             batched: Vec::new(),
+            keys: RefCell::default(),
         })
     }
 
@@ -546,6 +555,7 @@ impl Db {
             path_table_parser: None,
             calls: CallReporter::new(),
             batched: Vec::new(),
+            keys: RefCell::default(),
         })
     }
 
@@ -657,12 +667,11 @@ impl Db {
     /// Return the column names declared in `table`'s DDL.
     pub fn get_table_columns(&self, table: &str) -> Result<Vec<String>> {
         validate_identifier(table)?;
-        let mut stmt = self.conn.prepare(&format!(
-            "PRAGMA table_info({})",
-            crate::sql_literal::quote_identifier(table)
-        ))?;
+        let mut stmt = self
+            .conn
+            .prepare_cached("SELECT name FROM pragma_table_info(?1) ORDER BY cid")?;
         let columns: Vec<String> = stmt
-            .query_map([], |row| row.get::<_, String>(1))?
+            .query_map([table], |row| row.get::<_, String>(0))?
             .filter_map(|r| r.ok())
             .collect();
         Ok(columns)
@@ -902,20 +911,19 @@ impl Db {
             &mut stored,
         )?;
         let key = self.row_key(table, rows)?;
-        let (changes, _) = self.reconcile_rows(table, &stored, rows, key.as_deref())?;
-        if changes.is_empty() {
+        let (changes, placed) = self.reconcile_rows(table, &stored, rows, key.as_deref())?;
+        // An update keeps its rowid, so only a removal or an addition can move
+        // the owner's range.
+        if changes.removed.is_empty() && changes.added.is_empty() {
             return Ok(changes);
         }
-        self.conn.execute(
-            "DELETE FROM _dirsql_internal_ranges WHERE table_name = ?1 AND file_path = ?2",
-            rusqlite::params![table, owner],
-        )?;
-        let (first, last): (Option<i64>, Option<i64>) = self.conn.query_row(
-            &format!("SELECT min(rowid), max(rowid) FROM \"{table}\""),
-            [],
-            |r| Ok((r.get(0)?, r.get(1)?)),
-        )?;
-        if let (Some(first), Some(last)) = (first, last) {
+        self.conn
+            .prepare_cached(
+                "DELETE FROM _dirsql_internal_ranges WHERE table_name = ?1 AND file_path = ?2",
+            )?
+            .execute(rusqlite::params![table, owner])?;
+        // `placed` holds every row the table keeps.
+        if let (Some(&first), Some(&last)) = (placed.iter().min(), placed.iter().max()) {
             self.conn
                 .prepare_cached(RANGE_INSERT)?
                 .execute(rusqlite::params![table, owner, first, last])?;
@@ -1135,12 +1143,10 @@ impl Db {
         Ok((changes, placed))
     }
 
-    /// The positions in `rows.columns` of `table`'s key: its `PRIMARY KEY`,
-    /// else the first `UNIQUE` index whose columns `rows` emits non-NULL in
-    /// every row. A key the rows leave unset (a generated `INTEGER PRIMARY
-    /// KEY`) cannot match anything, so it is passed over.
-    fn row_key(&self, table: &str, rows: &ShapedRows) -> Result<Option<Vec<usize>>> {
-        let mut candidates: Vec<Vec<Option<String>>> = vec![
+    /// `table`'s `PRIMARY KEY` column names, then each plain `UNIQUE`
+    /// index's, as the schema declares them now.
+    fn key_candidates(&self, table: &str) -> Result<KeyCandidates> {
+        let mut candidates: KeyCandidates = vec![
             self.conn
                 .prepare_cached("SELECT name FROM pragma_table_info(?1) WHERE pk > 0 ORDER BY pk")?
                 .query_map([table], |r| r.get(0))?
@@ -1164,6 +1170,34 @@ impl Db {
                     .collect::<rusqlite::Result<_>>()?,
             );
         }
+        Ok(candidates)
+    }
+
+    /// The positions in `rows.columns` of `table`'s key: its `PRIMARY KEY`,
+    /// else the first `UNIQUE` index whose columns `rows` emits non-NULL in
+    /// every row. A key the rows leave unset (a generated `INTEGER PRIMARY
+    /// KEY`) cannot match anything, so it is passed over.
+    fn row_key(&self, table: &str, rows: &ShapedRows) -> Result<Option<Vec<usize>>> {
+        let version: i64 = self
+            .conn
+            .prepare_cached("PRAGMA schema_version")?
+            .query_row([], |r| r.get(0))?;
+        let cached = self
+            .keys
+            .borrow()
+            .get(table)
+            .filter(|(at, _)| *at == version)
+            .map(|(_, candidates)| candidates.clone());
+        let candidates = match cached {
+            Some(candidates) => candidates,
+            None => {
+                let candidates = self.key_candidates(table)?;
+                self.keys
+                    .borrow_mut()
+                    .insert(table.to_string(), (version, candidates.clone()));
+                candidates
+            }
+        };
         Ok(candidates.into_iter().find_map(|names| {
             let at = names
                 .iter()
@@ -4176,6 +4210,73 @@ mod tests {
         assert_eq!(changes.added.len(), 1, "got: {:?}", changes.added);
     }
 
+    #[test]
+    fn reconcile_batch_rows_writes_only_the_update_when_rows_change_in_place() {
+        let db = experiments_db();
+        let next = shaped(
+            &db,
+            "experiments",
+            serde_json::json!([
+                {"folder_name":"a","name":"Alpha"},
+                {"folder_name":"b","name":"Renamed"}
+            ]),
+        );
+        let before = db.conn().total_changes();
+
+        db.reconcile_batch_rows("experiments", "", &next).unwrap();
+
+        assert_eq!(db.conn().total_changes() - before, 1);
+        assert_eq!(range_rows(&db, "experiments"), vec![(String::new(), 1, 2)]);
+    }
+
+    #[test]
+    fn reconcile_batch_rows_keys_by_an_index_created_after_an_earlier_reconcile() {
+        let changes = |db: &Db, v: &str| {
+            let next = shaped(db, "t", serde_json::json!([{"k":"a","v":v}]));
+            db.reconcile_batch_rows("t", "", &next).unwrap()
+        };
+        let db = Db::new().unwrap();
+        db.create_table("t", "CREATE TABLE t (k TEXT, v TEXT)")
+            .unwrap();
+        db.insert_rows(
+            "t",
+            &shaped(&db, "t", serde_json::json!([{"k":"a","v":"0"}])),
+            "",
+        )
+        .unwrap();
+        assert!(!changes(&db, "1").keyed);
+
+        db.conn()
+            .execute_batch("CREATE UNIQUE INDEX t_k ON t(k)")
+            .unwrap();
+
+        assert!(changes(&db, "2").keyed);
+    }
+
+    #[test]
+    fn reconcile_batch_rows_reuses_the_key_read_at_the_same_schema_version() {
+        let db = experiments_db();
+        let version: i64 = db
+            .conn()
+            .query_row("PRAGMA schema_version", [], |r| r.get(0))
+            .unwrap();
+        db.keys
+            .borrow_mut()
+            .insert("experiments".into(), (version, Vec::new()));
+        let next = shaped(
+            &db,
+            "experiments",
+            serde_json::json!([
+                {"folder_name":"a","name":"Alpha"},
+                {"folder_name":"b","name":"Renamed"}
+            ]),
+        );
+
+        let changes = db.reconcile_batch_rows("experiments", "", &next).unwrap();
+
+        assert!(!changes.keyed);
+    }
+
     #[test]
     fn reconcile_batch_rows_writes_nothing_for_an_unchanged_keyed_table() {
         let db = experiments_db();