nidx-binding 6.3.5.post232__tar.gz → 6.3.5.post234__tar.gz

nidx_binding-6.3.5.post234/.sqlx/query-8d33717587c6ee8f5fc339a80b1212a73d6c03e45856b1d55457fc8074709dd0.json

@@ -0,0 +1,32 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT\n        COUNT(*) FILTER (WHERE started_at IS NULL AND enqueued_at < NOW() - INTERVAL '1 minute') AS \"queued!\",\n        COUNT(*) FILTER (WHERE started_at IS NULL AND enqueued_at > NOW() - INTERVAL '1 minute') AS \"recently_queued!\",\n        COUNT(*) FILTER (WHERE started_at IS NOT NULL) AS \"running!\"\n        FROM merge_jobs;\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "queued!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "recently_queued!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "running!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null,
+      null,
+      null
+    ]
+  },
+  "hash": "8d33717587c6ee8f5fc339a80b1212a73d6c03e45856b1d55457fc8074709dd0"
+}

{nidx_binding-6.3.5.post232 → nidx_binding-6.3.5.post234}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nidx_binding
-Version: 6.3.5.post232
+Version: 6.3.5.post234
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{nidx_binding-6.3.5.post232 → nidx_binding-6.3.5.post234}/nidx_protos/pyproject.toml

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

{nidx_binding-6.3.5.post232 → nidx_binding-6.3.5.post234}/pyproject.toml

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

{nidx_binding-6.3.5.post232 → nidx_binding-6.3.5.post234}/src/metrics.rs

@@ -162,6 +162,7 @@ pub mod scheduler {
     #[derive(Clone, Debug, EncodeLabelValue, PartialEq, Eq, Hash)]
     pub enum JobState {
         Queued,
+        RecentlyQueued,
         Running,
     }
 

{nidx_binding-6.3.5.post232 → nidx_binding-6.3.5.post234}/src/scheduler/metrics_task.rs

@@ -30,7 +30,8 @@ pub async fn update_merge_job_metric(metadb: &NidxMetadata) -> anyhow::Result<()
     let job_states = sqlx::query!(
         r#"
         SELECT
-        COUNT(*) FILTER (WHERE started_at IS NULL) AS "queued!",
+        COUNT(*) FILTER (WHERE started_at IS NULL AND enqueued_at < NOW() - INTERVAL '1 minute') AS "queued!",
+        COUNT(*) FILTER (WHERE started_at IS NULL AND enqueued_at > NOW() - INTERVAL '1 minute') AS "recently_queued!",
         COUNT(*) FILTER (WHERE started_at IS NOT NULL) AS "running!"
         FROM merge_jobs;
         "#
@@ -42,6 +43,11 @@ pub async fn update_merge_job_metric(metadb: &NidxMetadata) -> anyhow::Result<()
             state: JobState::Queued,
         })
         .set(job_states.queued);
+    metrics::scheduler::QUEUED_JOBS
+        .get_or_create(&JobFamily {
+            state: JobState::RecentlyQueued,
+        })
+        .set(job_states.queued);
     metrics::scheduler::QUEUED_JOBS
         .get_or_create(&JobFamily {
             state: JobState::Running,

nidx_binding-6.3.5.post232/.sqlx/query-bfb8ae2e860e451b0868a7b1b50a451d998b2105f9fdfd307b26a1775d145e9f.json

@@ -1,26 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        SELECT\n        COUNT(*) FILTER (WHERE started_at IS NULL) AS \"queued!\",\n        COUNT(*) FILTER (WHERE started_at IS NOT NULL) AS \"running!\"\n        FROM merge_jobs;\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "queued!",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "running!",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      null,
-      null
-    ]
-  },
-  "hash": "bfb8ae2e860e451b0868a7b1b50a451d998b2105f9fdfd307b26a1775d145e9f"
-}