merge

backend/windmill-api/src/jobs.rs

@@ -5746,7 +5746,6 @@ async fn get_job_update(
     Path((w_id, job_id)): Path<(String, Uuid)>,
     Query(JobUpdateQuery { log_offset, get_progress, running, only_result }): Query<JobUpdateQuery>,
 ) -> JsonResult<JobUpdate> {
-<<<<<<< HEAD
     Ok(Json(
         get_job_update_data(
             &opt_authed,
@@ -5764,54 +5763,6 @@ async fn get_job_update(
         .await?,
     ))
 }
-=======
-    let record = sqlx::query!(
-        "SELECT
-            c.id IS NOT NULL AS completed,
-            CASE
-                WHEN q.id IS NOT NULL THEN (CASE WHEN NOT $5 AND q.running THEN true ELSE null END)
-                ELSE false
-            END AS running,
-            SUBSTR(logs, GREATEST($1 - log_offset, 0)) AS logs,
-            COALESCE(r.memory_peak, c.memory_peak) AS mem_peak,
-            CASE
-                -- flow step:
-                WHEN flow_step_id IS NOT NULL THEN NULL
-                -- completed:
-                WHEN c.id IS NOT NULL THEN COALESCE(
-                    c.workflow_as_code_status || c.flow_status,
-                    c.workflow_as_code_status,
-                    c.flow_status
-                )
-                -- not completed:
-                ELSE COALESCE(
-                    f.workflow_as_code_status || f.flow_status,
-                    f.workflow_as_code_status,
-                    f.flow_status
-                )
-            END AS \"flow_status: sqlx::types::Json<Box<RawValue>>\",
-            job_logs.log_offset + CHAR_LENGTH(job_logs.logs) + 1 AS log_offset,
-            created_by AS \"created_by!\",
-            CASE WHEN $4::BOOLEAN THEN (
-                SELECT scalar_int FROM job_stats WHERE job_id = $3 AND metric_id = 'progress_perc'
-            ) END AS progress
-        FROM v2_job j
-            LEFT JOIN v2_job_queue q USING (id)
-            LEFT JOIN v2_job_runtime r USING (id)
-            LEFT JOIN v2_job_status f USING (id)
-            LEFT JOIN v2_job_completed c USING (id)
-            LEFT JOIN job_logs ON job_logs.job_id =  $3
-        WHERE j.workspace_id = $2 AND j.id = $3",
-        log_offset,
-        &w_id,
-        job_id,
-        get_progress.unwrap_or(false),
-        running,
-    )
-    .fetch_optional(&db)
-    .await?
-    .ok_or_else(|| Error::NotFound(format!("Job not found: {}", job_id)))?;
->>>>>>> main
 
 async fn get_job_update_sse(
     OptAuthed(opt_authed): OptAuthed,