Skip to content

Commit 0a75d2f

Browse files
authored
[cuebot] Fix for nullpointer jobs with str_loki_url set to null (#1713)
**Link the Issue(s) this Pull Request is related to.** This is a fix for #1696 **Summarize your change.** Added a COALESCE in the dispatch database queries to make sure it returns a valid string
1 parent 5069b92 commit 0a75d2f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

cuebot/src/main/java/com/imageworks/spcue/dao/postgres/DispatchQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ private static final String replaceQueryForFifo(String query) {
530530
"int_uid, " +
531531
"str_log_dir, " +
532532
"COALESCE(str_os, '') AS str_os, " +
533-
"str_loki_url, " +
533+
"COALESCE(str_loki_url, '') AS str_loki_url, " +
534534
"frame_name, " +
535535
"frame_state, " +
536536
"pk_frame, " +

cuebot/src/main/java/com/imageworks/spcue/dao/postgres/FrameDaoJdbc.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,10 @@ public DispatchFrame mapRow(ResultSet rs, int rowNum) throws SQLException {
245245
private static final String GET_DISPATCH_FRAME = "SELECT " + "show.str_name AS show_name, "
246246
+ "job.str_name AS job_name, " + "job.pk_job," + "job.pk_show," + "job.pk_facility,"
247247
+ "job.str_name," + "job.str_shot," + "job.str_user," + "job.int_uid,"
248-
+ "job.str_log_dir," + "COALESCE(str_os, '') AS str_os, " + "job.str_loki_url, "
249-
+ "frame.str_name AS frame_name, " + "frame.str_state AS frame_state, "
250-
+ "frame.pk_frame, " + "frame.pk_layer, " + "frame.int_retries, "
251-
+ "frame.int_version, " + "layer.str_name AS layer_name, "
248+
+ "job.str_log_dir," + "COALESCE(str_os, '') AS str_os, "
249+
+ "COALESCE(str_loki_url, '') AS str_loki_url, " + "frame.str_name AS frame_name, "
250+
+ "frame.str_state AS frame_state, " + "frame.pk_frame, " + "frame.pk_layer, "
251+
+ "frame.int_retries, " + "frame.int_version, " + "layer.str_name AS layer_name, "
252252
+ "layer.str_type AS layer_type, " + "layer.str_cmd, " + "layer.int_cores_min,"
253253
+ "layer.int_cores_max," + "layer.b_threadable," + "layer.int_mem_min, "
254254
+ "layer.int_gpus_min," + "layer.int_gpus_max," + "layer.int_gpu_mem_min, "

0 commit comments

Comments
 (0)