diff --git a/core/src/pg_ext.rs b/core/src/pg_ext.rs index 7c918241..5b3281ad 100644 --- a/core/src/pg_ext.rs +++ b/core/src/pg_ext.rs @@ -5,7 +5,7 @@ use crate::Message; use log::info; use serde::{Deserialize, Serialize}; use sqlx::types::chrono::Utc; -use sqlx::{Pool, Postgres, Executor}; +use sqlx::{Executor, Pool, Postgres}; /// Main controller for interacting with a managed by the PGMQ Postgres extension. #[derive(Clone, Debug)] @@ -68,7 +68,11 @@ impl PGMQueueExt { /// Drop an existing queue table. pub async fn drop_queue(&self, queue_name: &str) -> Result<(), PgmqError> { check_input(queue_name)?; - self.connection.execute(sqlx::query!("SELECT * from pgmq_drop_queue($1::text);", queue_name)) + self.connection + .execute(sqlx::query!( + "SELECT * from pgmq_drop_queue($1::text);", + queue_name + )) .await?; Ok(()) diff --git a/src/partition.rs b/src/partition.rs index dc3bffa3..011d5b69 100644 --- a/src/partition.rs +++ b/src/partition.rs @@ -22,11 +22,11 @@ pub fn init_partitioned_queue( Ok(vec![ create_meta(), grant_pgmon_meta(), - create_partitioned_queue(name, &partition_col)?, - create_partitioned_index(name, &partition_col)?, + create_partitioned_queue(name, partition_col)?, + create_partitioned_index(name, partition_col)?, create_index(name)?, create_archive(name)?, - create_partitioned_table(name, &partition_col, partition_interval)?, + create_partitioned_table(name, partition_col, partition_interval)?, insert_meta(name)?, set_retention_config(name, retention_interval)?, grant_pgmon_queue(name)?, @@ -35,12 +35,12 @@ pub fn init_partitioned_queue( } /// maps the partition column based on partition_interval -fn map_partition_col(partition_interval: &str) -> String { +fn map_partition_col(partition_interval: &str) -> &'static str { // map using msg_id when partition_interval is an integer // otherwise use enqueued_at (time based) match partition_interval.parse::() { - Ok(_) => "msg_id".to_owned(), - Err(_) => "enqueued_at".to_owned(), + Ok(_) => "msg_id", + Err(_) => "enqueued_at", } } @@ -111,14 +111,14 @@ mod tests { assert!(query.contains("enqueued_at")); let query = map_partition_col("1 day"); assert!(query.contains("enqueued_at")); - let query: String = map_partition_col("10 days"); + let query = map_partition_col("10 days"); assert!(query.contains("enqueued_at")); - let query: String = map_partition_col("100"); + let query = map_partition_col("100"); assert!(query.contains("msg_id")); - let query: String = map_partition_col("1"); + let query = map_partition_col("1"); assert!(query.contains("msg_id")); - let query: String = map_partition_col("99"); + let query = map_partition_col("99"); assert!(query.contains("msg_id")); } }