Skip to content

dedupe fns #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChuckHend merged 2 commits into from
May 28, 2026
Merged

dedupe fns #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98b7db3
dedupe fns
ChuckHend May 21, 2026
8824eb6
remove unreachable match arm
ChuckHend May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ serde_json = "1.0"
sqlparser = "0.51"
sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "postgres", "uuid", "time"] }
thiserror = "2.0.12"
tracing = { workspace = true }
tiktoken-rs = "0.7.0"
tokio = { version = "1.0", features = ["full"] }
tokio-postgres = "0.7"
Expand Down
146 changes: 146 additions & 0 deletions core/src/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
use std::collections::HashMap;
use std::sync::Arc;
use tokio::sync::RwLock;
use tracing::{error, info};

use crate::types::VectorizeJob;

pub async fn setup_job_change_notifications(
pool: &sqlx::PgPool,
) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
let mut tx = pool.begin().await?;

let create_notify_function = r#"
CREATE OR REPLACE FUNCTION vectorize.notify_job_change()
RETURNS TRIGGER AS $$
BEGIN
IF TG_OP = 'DELETE' THEN
PERFORM pg_notify('vectorize_job_changes',
json_build_object(
'operation', TG_OP,
'job_name', OLD.job_name
)::text
);
RETURN OLD;
ELSE
PERFORM pg_notify('vectorize_job_changes',
json_build_object(
'operation', TG_OP,
'job_name', NEW.job_name
)::text
);
RETURN NEW;
END IF;
END;
$$ LANGUAGE plpgsql;
"#;

sqlx::query("DROP TRIGGER IF EXISTS job_change_trigger ON vectorize.job;")
.execute(&mut *tx)
.await?;

let create_trigger = r#"
CREATE TRIGGER job_change_trigger
AFTER INSERT OR UPDATE OR DELETE ON vectorize.job
FOR EACH ROW EXECUTE FUNCTION vectorize.notify_job_change();
"#;

sqlx::query(create_notify_function)
.execute(&mut *tx)
.await?;
sqlx::query(create_trigger).execute(&mut *tx).await?;

tx.commit().await?;
info!("Database trigger for job changes setup successfully");
Ok(())
}

pub async fn try_listen_for_changes(
db_pool: &sqlx::PgPool,
job_cache: &Arc<RwLock<HashMap<String, VectorizeJob>>>,
) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
let mut listener = sqlx::postgres::PgListener::connect_with(db_pool).await?;
listener.listen("vectorize_job_changes").await?;

info!("Connected and listening for vectorize job changes");

loop {
match listener.recv().await {
Ok(notification) => {
info!(
"Received job change notification: {}",
notification.payload()
);

if let Ok(payload) =
serde_json::from_str::<serde_json::Value>(notification.payload())
{
let operation = payload.get("operation").and_then(|v| v.as_str());
let job_name = payload.get("job_name").and_then(|v| v.as_str());
info!(
"Job change detected - Operation: {}, Job: {}",
operation.unwrap_or("unknown"),
job_name.unwrap_or("unknown")
);
}

if let Err(e) = refresh_job_cache(db_pool, job_cache).await {
error!("Failed to refresh job cache: {e}");
} else {
info!("Job cache refreshed successfully");
}
}
Err(e) => {
error!("Error receiving notification: {e}");
return Err(e.into());
}
}
}
}

pub async fn refresh_job_cache(
db_pool: &sqlx::PgPool,
job_cache: &Arc<RwLock<HashMap<String, VectorizeJob>>>,
) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
let all_jobs: Vec<VectorizeJob> = sqlx::query_as(
"SELECT job_name, src_table, src_schema, src_columns, primary_key, update_time_col, model FROM vectorize.job",
)
.fetch_all(db_pool)
.await?;

let jobmap: HashMap<String, VectorizeJob> = all_jobs
.into_iter()
.map(|mut item| {
let key = std::mem::take(&mut item.job_name);
(key, item)
})
.collect();

{
let mut jobmap_write = job_cache.write().await;
*jobmap_write = jobmap;
info!("Updated job cache with {} jobs", jobmap_write.len());
}

Ok(())
}

pub async fn load_initial_job_cache(
pool: &sqlx::PgPool,
) -> Result<HashMap<String, VectorizeJob>, sqlx::Error> {
let all_jobs: Vec<VectorizeJob> = sqlx::query_as(
"SELECT job_name, src_table, src_schema, src_columns, primary_key, update_time_col, model FROM vectorize.job",
)
.fetch_all(pool)
.await?;

let jobmap: HashMap<String, VectorizeJob> = all_jobs
.into_iter()
.map(|mut item| {
let key = std::mem::take(&mut item.job_name);
(key, item)
})
.collect();

Ok(jobmap)
}
1 change: 1 addition & 0 deletions core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
pub mod cache;
pub mod config;
pub mod db;
pub mod errors;
Expand Down
158 changes: 14 additions & 144 deletions proxy/src/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,59 +1,19 @@
use std::collections::HashMap;
use std::sync::Arc;
use std::time::Duration;
use tracing::{error, info};
use tracing::error;
use vectorize_core::types::VectorizeJob;

use super::protocol::{ProxyConfig, WireProxyError};

pub async fn setup_job_change_notifications(
pool: &sqlx::PgPool,
) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
let mut tx = pool.begin().await?;

let create_notify_function = r#"
CREATE OR REPLACE FUNCTION vectorize.notify_job_change()
RETURNS TRIGGER AS $$
BEGIN
IF TG_OP = 'DELETE' THEN
PERFORM pg_notify('vectorize_job_changes',
json_build_object(
'operation', TG_OP,
'job_name', OLD.job_name
)::text
);
RETURN OLD;
ELSE
PERFORM pg_notify('vectorize_job_changes',
json_build_object(
'operation', TG_OP,
'job_name', NEW.job_name
)::text
);
RETURN NEW;
END IF;
END;
$$ LANGUAGE plpgsql;
"#;

sqlx::query("DROP TRIGGER IF EXISTS job_change_trigger ON vectorize.job;")
.execute(&mut *tx)
.await?;

let create_trigger = r#"
CREATE TRIGGER job_change_trigger
AFTER INSERT OR UPDATE OR DELETE ON vectorize.job
FOR EACH ROW EXECUTE FUNCTION vectorize.notify_job_change();
"#;
pub use vectorize_core::cache::setup_job_change_notifications;

sqlx::query(create_notify_function)
.execute(&mut *tx)
.await?;
sqlx::query(create_trigger).execute(&mut *tx).await?;

tx.commit().await?;
info!("Database trigger for job changes setup successfully");
Ok(())
pub async fn load_initial_job_cache(
pool: &sqlx::PgPool,
) -> Result<HashMap<String, VectorizeJob>, WireProxyError> {
vectorize_core::cache::load_initial_job_cache(pool)
.await
.map_err(WireProxyError::Database)
}

pub async fn start_cache_sync_listener(
Expand All @@ -63,102 +23,12 @@ pub async fn start_cache_sync_listener(
let max_retry_delay = Duration::from_secs(60);

loop {
match try_listen_for_changes(&config).await {
Ok(_) => retry_delay = Duration::from_secs(1),
Err(e) => {
error!("Cache sync listener error: {e}. Retrying in {retry_delay:?}");
tokio::time::sleep(retry_delay).await;
retry_delay = std::cmp::min(retry_delay * 2, max_retry_delay);
}
if let Err(e) =
vectorize_core::cache::try_listen_for_changes(&config.db_pool, &config.jobmap).await
{
error!("Cache sync listener error: {e}. Retrying in {retry_delay:?}");
tokio::time::sleep(retry_delay).await;
retry_delay = std::cmp::min(retry_delay * 2, max_retry_delay);
}
}
}

async fn try_listen_for_changes(
config: &ProxyConfig,
) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
let mut listener = sqlx::postgres::PgListener::connect_with(&config.db_pool).await?;
listener.listen("vectorize_job_changes").await?;

info!("Connected and listening for vectorize job changes");

loop {
match listener.recv().await {
Ok(notification) => {
info!(
"Received job change notification: {}",
notification.payload()
);

if let Ok(payload) =
serde_json::from_str::<serde_json::Value>(notification.payload())
{
let operation = payload.get("operation").and_then(|v| v.as_str());
let job_name = payload.get("job_name").and_then(|v| v.as_str());
info!(
"Job change detected - Operation: {}, Job: {}",
operation.unwrap_or("unknown"),
job_name.unwrap_or("unknown")
);
}

if let Err(e) = refresh_job_cache(config).await {
error!("Failed to refresh job cache: {e}");
} else {
info!("Job cache refreshed successfully");
}
}
Err(e) => {
error!("Error receiving notification: {e}");
return Err(e.into());
}
}
}
}

pub async fn refresh_job_cache(
config: &ProxyConfig,
) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
let all_jobs: Vec<VectorizeJob> = sqlx::query_as(
"SELECT job_name, src_table, src_schema, src_columns, primary_key, update_time_col, model FROM vectorize.job",
)
.fetch_all(&config.db_pool)
.await?;

let jobmap: HashMap<String, VectorizeJob> = all_jobs
.into_iter()
.map(|mut item| {
let key = std::mem::take(&mut item.job_name);
(key, item)
})
.collect();

{
let mut jobmap_write = config.jobmap.write().await;
*jobmap_write = jobmap;
info!("Updated job cache with {} jobs", jobmap_write.len());
}

Ok(())
}

pub async fn load_initial_job_cache(
pool: &sqlx::PgPool,
) -> Result<HashMap<String, VectorizeJob>, WireProxyError> {
let all_jobs: Vec<VectorizeJob> = sqlx::query_as(
"SELECT job_name, src_table, src_schema, src_columns, primary_key, update_time_col, model FROM vectorize.job",
)
.fetch_all(pool)
.await
.map_err(WireProxyError::Database)?;

let jobmap: HashMap<String, VectorizeJob> = all_jobs
.into_iter()
.map(|mut item| {
let key = std::mem::take(&mut item.job_name);
(key, item)
})
.collect();

Ok(jobmap)
}
Loading
Loading