nidx-binding 6.3.0.post12__tar.gz → 6.3.1.post17__tar.gz

nidx_binding-6.3.0.post12/.sqlx/query-e61329fbb184d48a81fbe18bb66b8f1947724b77bada24ebd56b0fbb800b2c7e.json → nidx_binding-6.3.1.post17/.sqlx/query-abe9f7832f2bd799ac44008da031e8d8ab52d4f5fbfc2a7e3974e8873bae55b2.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT COALESCE(MIN(seq) - 1, (SELECT last_value FROM index_requests_seq_seq)) AS \"seq!\" FROM index_requests",
+  "query": "SELECT COALESCE(MIN(seq) - 1, (SELECT last_value FROM index_requests_seq_seq)) AS \"seq!\"\n             FROM index_requests WHERE received_at > NOW() - INTERVAL '1 minute'",
   "describe": {
     "columns": [
       {
@@ -16,5 +16,5 @@
       null
     ]
   },
-  "hash": "e61329fbb184d48a81fbe18bb66b8f1947724b77bada24ebd56b0fbb800b2c7e"
+  "hash": "abe9f7832f2bd799ac44008da031e8d8ab52d4f5fbfc2a7e3974e8873bae55b2"
 }

{nidx_binding-6.3.0.post12 → nidx_binding-6.3.1.post17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nidx_binding
-Version: 6.3.0.post12
+Version: 6.3.1.post17
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{nidx_binding-6.3.0.post12 → nidx_binding-6.3.1.post17}/nidx_binding/src/lib.rs

@@ -49,6 +49,10 @@ impl GetAckFloor for SeqSource {
         let seq = self.0.load(std::sync::atomic::Ordering::Relaxed);
         Ok(seq)
     }
+
+    async fn cleanup(&self) -> anyhow::Result<()> {
+        Ok(())
+    }
 }
 
 #[pyclass]

{nidx_binding-6.3.0.post12 → nidx_binding-6.3.1.post17}/nidx_protos/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "nidx_protos"
-version = "6.3.0.post12"
+version = "6.3.1.post17"
 license = { text = "AGPL" }
 description = "Protobuf definitions for nucliadb/nidx"
 authors = [ { name = "Nuclia", email = "nucliadb@nuclia.com" }]

{nidx_binding-6.3.0.post12 → nidx_binding-6.3.1.post17}/pyproject.toml

@@ -13,7 +13,7 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
-version = "6.3.0.post12"
+version = "6.3.1.post17"
 
 [project.urls]
 Homepage = "https://nuclia.com"

{nidx_binding-6.3.0.post12 → nidx_binding-6.3.1.post17}/src/metadata/index_request.rs

@@ -43,7 +43,7 @@ impl IndexRequest {
         Ok(())
     }
 
-    pub async fn delete_old(&self, meta: impl Executor<'_, Database = Postgres>) -> sqlx::Result<()> {
+    pub async fn delete_old(meta: impl Executor<'_, Database = Postgres>) -> sqlx::Result<()> {
         sqlx::query!("DELETE FROM index_requests WHERE received_at < NOW() - INTERVAL '1 minute'")
             .execute(meta)
             .await?;
@@ -52,7 +52,8 @@ impl IndexRequest {
 
     pub async fn last_ack_seq(meta: impl Executor<'_, Database = Postgres>) -> sqlx::Result<i64> {
         sqlx::query_scalar!(
-            "SELECT COALESCE(MIN(seq) - 1, (SELECT last_value FROM index_requests_seq_seq)) AS \"seq!\" FROM index_requests"
+            "SELECT COALESCE(MIN(seq) - 1, (SELECT last_value FROM index_requests_seq_seq)) AS \"seq!\"
+             FROM index_requests WHERE received_at > NOW() - INTERVAL '1 minute'"
         )
         .fetch_one(meta)
         .await

{nidx_binding-6.3.0.post12 → nidx_binding-6.3.1.post17}/src/scheduler.rs

@@ -68,6 +68,7 @@ pub async fn run(settings: Settings, shutdown: CancellationToken) -> anyhow::Res
 
 pub trait GetAckFloor {
     fn get(&mut self) -> impl Future<Output = anyhow::Result<i64>> + Send;
+    fn cleanup(&self) -> impl Future<Output = anyhow::Result<()>> + Send;
 }
 
 #[derive(Clone)]
@@ -77,6 +78,10 @@ impl GetAckFloor for NatsAckFloor {
     async fn get(&mut self) -> anyhow::Result<i64> {
         Ok(self.0.info().await?.ack_floor.stream_sequence as i64)
     }
+
+    async fn cleanup(&self) -> anyhow::Result<()> {
+        Ok(())
+    }
 }
 
 #[derive(Clone)]
@@ -86,6 +91,11 @@ impl GetAckFloor for PgAckFloor {
     async fn get(&mut self) -> anyhow::Result<i64> {
         Ok(IndexRequest::last_ack_seq(&self.0.pool).await?)
     }
+
+    async fn cleanup(&self) -> anyhow::Result<()> {
+        IndexRequest::delete_old(&self.0.pool).await?;
+        Ok(())
+    }
 }
 
 pub async fn run_tasks(
@@ -127,6 +137,16 @@ pub async fn run_tasks(
         }
     });
 
+    let ack_floor_copy = ack_floor.clone();
+    tasks.spawn(async move {
+        loop {
+            if let Err(e) = ack_floor_copy.cleanup().await {
+                warn!("Error cleaning up AckFloor: {e:?}");
+            }
+            sleep(Duration::from_secs(60)).await;
+        }
+    });
+
     let meta2 = meta.clone();
     let mut ack_floor_copy = ack_floor.clone();
     tasks.spawn(async move {