diff --git a/iml-services/iml-journal/src/main.rs b/iml-services/iml-journal/src/main.rs index 1dcf7546a7..3a504e7c05 100644 --- a/iml-services/iml-journal/src/main.rs +++ b/iml-services/iml-journal/src/main.rs @@ -7,7 +7,7 @@ use iml_journal::{execute_handlers, get_message_class, ImlJournalError}; use iml_manager_env::get_pool_limit; use iml_postgres::{ get_db_pool, - sqlx::{self, PgPool}, + sqlx::{self, Done, PgPool}, }; use iml_service_queue::service_queue::consume_data; use iml_tracing::tracing; @@ -31,25 +31,22 @@ async fn purge_excess(pool: &PgPool, num_rows: i64) -> Result 0 { - let xs = sqlx::query!( + let x = sqlx::query!( r#" DELETE FROM chroma_core_logmessage WHERE id in ( SELECT id FROM chroma_core_logmessage ORDER BY id LIMIT $1 ) - RETURNING id"#, + "#, std::cmp::min(10_000, num_remove) ) - .fetch_all(pool) - .await?; + .execute(pool) + .await? + .rows_affected(); - num_remove -= xs.len() as i64; + num_remove -= x as i64; - tracing::info!( - "Purged {} rows, {} remain for purging", - xs.len(), - num_remove - ); + tracing::info!("Purged {} rows, {} remain for purging", x, num_remove); } Ok(num_rows) diff --git a/sqlx-data.json b/sqlx-data.json index 5fdf6fae19..040808dc36 100644 --- a/sqlx-data.json +++ b/sqlx-data.json @@ -743,24 +743,16 @@ ] } }, - "9e69b2d4692f2bcd76349322b1bbdbb71ada4d3144fc543bff0417ccc576a62a": { - "query": "\n DELETE FROM chroma_core_logmessage\n WHERE id in ( \n SELECT id FROM chroma_core_logmessage ORDER BY id LIMIT $1\n )\n RETURNING id", + "922e7457db1e165807273def66a5ecc6b22be1a849f5e4b06d5149ec00b5e8aa": { + "query": "\n DELETE FROM chroma_core_logmessage\n WHERE id in ( \n SELECT id FROM chroma_core_logmessage ORDER BY id LIMIT $1\n )\n ", "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int4" - } - ], + "columns": [], "parameters": { "Left": [ "Int8" ] }, - "nullable": [ - false - ] + "nullable": [] } }, "9edb0846023aa1a9250204fb686d5b95a95962ce20aab75cec2e906edad8eec7": {