From 4896a3f07d5132e1d89d6f0697fe94e0e960182f Mon Sep 17 00:00:00 2001 From: LJ Date: Tue, 13 May 2025 19:35:37 -0700 Subject: [PATCH] refactor: s/retriable/retryable/ --- src/execution/live_updater.rs | 6 +++--- src/ops/storages/neo4j.rs | 8 ++++---- src/prelude.rs | 2 +- src/utils/mod.rs | 2 +- src/utils/{retriable.rs => retryable.rs} | 0 5 files changed, 9 insertions(+), 9 deletions(-) rename src/utils/{retriable.rs => retryable.rs} (100%) diff --git a/src/execution/live_updater.rs b/src/execution/live_updater.rs index fa3a2358..f5fabc9c 100644 --- a/src/execution/live_updater.rs +++ b/src/execution/live_updater.rs @@ -125,7 +125,7 @@ async fn update_source( futs.push( async move { let mut change_stream = change_stream; - let retry_options = retriable::RetryOptions { + let retry_options = retryable::RetryOptions { max_retries: None, initial_backoff: std::time::Duration::from_secs(5), max_backoff: std::time::Duration::from_secs(60), @@ -134,14 +134,14 @@ async fn update_source( // Workaround as AsyncFnMut isn't mature yet. // Should be changed to use AsyncFnMut once it is. let change_stream = tokio::sync::Mutex::new(&mut change_stream); - let change_msg = retriable::run( + let change_msg = retryable::run( || async { let mut change_stream = change_stream.lock().await; change_stream .next() .await .transpose() - .map_err(retriable::Error::always_retryable) + .map_err(retryable::Error::always_retryable) }, &retry_options, ) diff --git a/src/ops/storages/neo4j.rs b/src/ops/storages/neo4j.rs index 5e4416ed..b25334de 100644 --- a/src/ops/storages/neo4j.rs +++ b/src/ops/storages/neo4j.rs @@ -103,7 +103,7 @@ impl GraphElement { } } -impl retriable::IsRetryable for neo4rs::Error { +impl retryable::IsRetryable for neo4rs::Error { fn is_retryable(&self) -> bool { match self { neo4rs::Error::ConnectionError => true, @@ -1289,11 +1289,11 @@ impl StorageFactoryBase for Factory { .or_insert_with(Vec::new) .push(mut_with_ctx); } - let retry_options = retriable::RetryOptions::default(); + let retry_options = retryable::RetryOptions::default(); for muts in muts_by_graph.values_mut() { muts.sort_by_key(|m| m.export_context.create_order); let graph = &muts[0].export_context.graph; - retriable::run( + retryable::run( async || { let mut queries = vec![]; for mut_with_ctx in muts.iter() { @@ -1311,7 +1311,7 @@ impl StorageFactoryBase for Factory { let mut txn = graph.start_txn().await?; txn.run_queries(queries).await?; txn.commit().await?; - retriable::Ok(()) + retryable::Ok(()) }, &retry_options, ) diff --git a/src/prelude.rs b/src/prelude.rs index f19c8a4c..0ae8d03a 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -25,7 +25,7 @@ pub(crate) use crate::lib_context::{get_lib_context, get_runtime, FlowContext, L pub(crate) use crate::ops::interface; pub(crate) use crate::service::error::ApiError; pub(crate) use crate::setup::AuthRegistry; -pub(crate) use crate::utils::retriable; +pub(crate) use crate::utils::retryable; pub(crate) use crate::{api_bail, api_error}; diff --git a/src/utils/mod.rs b/src/utils/mod.rs index 4a589e3c..8923dedf 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -1,5 +1,5 @@ pub mod db; pub mod fingerprint; pub mod immutable; -pub mod retriable; +pub mod retryable; pub mod yaml_ser; diff --git a/src/utils/retriable.rs b/src/utils/retryable.rs similarity index 100% rename from src/utils/retriable.rs rename to src/utils/retryable.rs