nidx-binding 6.9.5.post663__tar.gz → 6.9.5.post667__tar.gz

nidx_binding-6.9.5.post667/.sqlx/query-fd97b359c7a7cdc573b2112efbafb9956ae71d8f875c38140cba1c04b7084b47.json

@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE indexes SET updated_at = NOW() WHERE id IN (\n                SELECT id FROM indexes WHERE id = ANY ($1) FOR NO KEY UPDATE SKIP LOCKED\n            )",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8Array"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "fd97b359c7a7cdc573b2112efbafb9956ae71d8f875c38140cba1c04b7084b47"
+}

{nidx_binding-6.9.5.post663 → nidx_binding-6.9.5.post667}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nidx_binding
-Version: 6.9.5.post663
+Version: 6.9.5.post667
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{nidx_binding-6.9.5.post663 → nidx_binding-6.9.5.post667}/nidx_protos/pyproject.toml

@@ -4,13 +4,13 @@ requires = [
     # Pin grpio-tools so `make protos` compile with the version we want
     # To use grpc stubs, you need a newer dependency than what was used to build this module
     "grpcio-tools>=1.71.0,==1.71.0,<1.72.0",
-    "mypy-protobuf>=3.6.0",
+    "mypy-protobuf==3.6.0",
 ]
 build-backend = "pdm.backend"
 
 [project]
 name = "nidx_protos"
-version = "6.9.5.post663"
+version = "6.9.5.post667"
 license = "AGPL-3.0-or-later"
 description = "Protobuf definitions for nucliadb/nidx"
 authors = [{ name = "Nuclia", email = "nucliadb@nuclia.com" }]

{nidx_binding-6.9.5.post663 → nidx_binding-6.9.5.post667}/pyproject.toml

@@ -13,7 +13,7 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
-version = "6.9.5.post663"
+version = "6.9.5.post667"
 
 [project.urls]
 Homepage = "https://nuclia.com"

{nidx_binding-6.9.5.post663 → nidx_binding-6.9.5.post667}/src/indexer.rs

@@ -278,11 +278,11 @@ pub async fn delete_resource(meta: &NidxMetadata, shard_id: &str, resource: Stri
     let indexes = Index::for_shard(&meta.pool, shard_id).await?;
 
     let mut tx = meta.transaction().await?;
-    for index in indexes {
+    for index in &indexes {
         Deletion::create(&mut *tx, index.id, seq, std::slice::from_ref(&resource)).await?;
-        Index::updated(&mut *tx, &index.id).await?;
     }
     tx.commit().await?;
+    Index::updated_many(&meta.pool, &indexes.iter().map(|i| i.id).collect::<Vec<_>>()).await?;
 
     Ok(())
 }
@@ -374,8 +374,8 @@ pub async fn index_resource(
             indexes.push(index_id)
         }
     }
-    Index::updated_many(&mut *tx, &indexes).await?;
     tx.commit().await?;
+    Index::updated_many(&meta.pool, &indexes).await?;
     TOTAL_INDEXING_TIME.observe(t.elapsed().as_secs_f64());
 
     Ok(())

{nidx_binding-6.9.5.post663 → nidx_binding-6.9.5.post667}/src/metadata/index.rs

@@ -180,19 +180,14 @@ impl Index {
         .await
     }
 
-    pub async fn updated(meta: impl Executor<'_, Database = Postgres>, index_id: &IndexId) -> sqlx::Result<()> {
-        sqlx::query!(
-            "UPDATE indexes SET updated_at = NOW() WHERE id = $1",
-            index_id as &IndexId
-        )
-        .execute(meta)
-        .await?;
-        Ok(())
-    }
-
+    /// Mark indexes as updated. If there is a transaction already updating the index (holding a lock), it will skip
+    /// the update since it's already being updated by another transaction. This means this function should be called
+    /// after the changes it made are committed, in another transaction.
     pub async fn updated_many(meta: impl Executor<'_, Database = Postgres>, index_id: &[IndexId]) -> sqlx::Result<()> {
         sqlx::query!(
-            "UPDATE indexes SET updated_at = NOW() WHERE id = ANY($1)",
+            "UPDATE indexes SET updated_at = NOW() WHERE id IN (
+                SELECT id FROM indexes WHERE id = ANY ($1) FOR NO KEY UPDATE SKIP LOCKED
+            )",
             index_id as &[IndexId]
         )
         .execute(meta)

{nidx_binding-6.9.5.post663 → nidx_binding-6.9.5.post667}/src/scheduler/audit_task.rs

@@ -153,7 +153,7 @@ mod tests {
         // Update a segment, report is sent
         let segment_para = Segment::create(&meta.pool, index_para.id, 2i64.into(), 22, serde_json::Value::Null).await?;
         segment_para.mark_ready(&meta.pool, 4444).await?;
-        Index::updated(&meta.pool, &index_para.id).await?;
+        Index::updated_many(&meta.pool, &[index_para.id]).await?;
         let since = audit_kb_storage(&meta, &reporter, since).await?.unwrap();
 
         let reports = reporter.0.lock().unwrap().clone();

{nidx_binding-6.9.5.post663 → nidx_binding-6.9.5.post667}/src/worker.rs

@@ -206,12 +206,13 @@ pub async fn run_job(
 
     // Delete old segments
     Segment::mark_many_for_deletion(&mut *tx, &segment_ids).await?;
-    Index::updated(&mut *tx, &index.id).await?;
 
     // Delete task if successful.
     job.finish(&mut *tx).await?;
     tx.commit().await?;
 
+    Index::updated_many(&meta.pool, &[index.id]).await?;
+
     PER_INDEX_MERGE_TIME
         .get_or_create(&IndexKindLabels::new(index.kind))
         .observe(t.elapsed().as_secs_f64());

nidx_binding-6.9.5.post663/.sqlx/query-24cb6b683daa42d7125f862e25943ab4be7bf275cd8739f8da4859d701795e1a.json

@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE indexes SET updated_at = NOW() WHERE id = $1",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "24cb6b683daa42d7125f862e25943ab4be7bf275cd8739f8da4859d701795e1a"
-}

nidx_binding-6.9.5.post663/.sqlx/query-95fe4ef93ee90733db1b67ed7987f80b5aac792f1590b979c68b418d1599eb98.json

@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE indexes SET updated_at = NOW() WHERE id = ANY($1)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8Array"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "95fe4ef93ee90733db1b67ed7987f80b5aac792f1590b979c68b418d1599eb98"
-}