backend: move bench.rs from common to worker crate (#5253)

This commit is contained in:
Lucas Abel
2025-02-10 11:39:59 +01:00
committed by GitHub
parent 4828a77f21
commit 4a744ff313
7 changed files with 12 additions and 11 deletions
+1 -1
View File
@@ -1713,7 +1713,7 @@ async fn handle_zombie_jobs(db: &Pool<Postgres>, base_internal_url: &str, worker
worker_name,
send_result_never_used,
#[cfg(feature = "benchmark")]
&mut windmill_common::bench::BenchmarkIter::new(),
&mut windmill_worker::bench::BenchmarkIter::new(),
)
.await;
}
-2
View File
@@ -19,8 +19,6 @@ use sqlx::{Pool, Postgres};
pub mod apps;
pub mod auth;
#[cfg(feature = "benchmark")]
pub mod bench;
pub mod cache;
pub mod db;
pub mod ee;
@@ -1,9 +1,9 @@
use crate::{
use serde::Serialize;
use tokio::time::Instant;
use windmill_common::{
worker::{write_file, TMP_DIR},
DB,
};
use serde::Serialize;
use tokio::time::Instant;
#[derive(Serialize)]
pub struct BenchmarkInfo {
@@ -79,7 +79,7 @@ impl BenchmarkIter {
}
pub async fn benchmark_init(benchmark_jobs: i32, db: &DB) {
use crate::{jobs::JobKind, scripts::ScriptLang};
use windmill_common::{jobs::JobKind, scripts::ScriptLang};
let benchmark_kind = std::env::var("BENCHMARK_KIND").unwrap_or("noop".to_string());
+3
View File
@@ -9,6 +9,8 @@ mod snowflake_executor;
mod ansible_executor;
mod bash_executor;
#[cfg(feature = "benchmark")]
pub mod bench;
mod bun_executor;
pub mod common;
mod config;
@@ -38,6 +40,7 @@ mod rust_executor;
mod worker;
mod worker_flow;
mod worker_lockfiles;
pub use worker::*;
pub use result_processor::handle_job_error;
@@ -26,7 +26,7 @@ use windmill_common::{
};
#[cfg(feature = "benchmark")]
use windmill_common::bench::{BenchmarkInfo, BenchmarkIter};
use crate::bench::{BenchmarkInfo, BenchmarkIter};
use windmill_queue::{append_logs, get_queued_job, CanceledBy, WrappedError};
+1 -1
View File
@@ -146,7 +146,7 @@ use crate::mssql_executor::do_mssql;
use crate::bigquery_executor::do_bigquery;
#[cfg(feature = "benchmark")]
use windmill_common::bench::{benchmark_init, BenchmarkInfo, BenchmarkIter};
use crate::bench::{benchmark_init, BenchmarkInfo, BenchmarkIter};
use windmill_common::add_time;
+2 -2
View File
@@ -11,6 +11,8 @@ use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::Arc;
use std::time::Duration;
#[cfg(feature = "benchmark")]
use crate::bench::BenchmarkIter;
use crate::common::{cached_result_path, save_in_cache};
use crate::js_eval::{eval_timeout, IdContext};
use crate::{
@@ -30,8 +32,6 @@ use tracing::instrument;
use uuid::Uuid;
use windmill_common::add_time;
use windmill_common::auth::JobPerms;
#[cfg(feature = "benchmark")]
use windmill_common::bench::BenchmarkIter;
use windmill_common::cache::{self, RawData};
use windmill_common::db::Authed;
use windmill_common::flow_status::{