From 97a72a08fb3389ca7744583f1538f4460bb9b8a8 Mon Sep 17 00:00:00 2001
From: Lars van der Bijl <285658+larsbijl@users.noreply.github.com>
Date: Sun, 14 Feb 2021 10:39:39 +0000
Subject: [PATCH] Remove unused config and task locks (#910)

Co-authored-by: Lars van der Bijl <lars@electrictheatre.tv>
---
 .../main/resources/conf/ddl/oracle/demo_data.sql | 16 ----------------
 .../resources/conf/ddl/postgres/demo_data.sql    | 16 ----------------
 .../test/resources/conf/ddl/oracle/test_data.sql | 15 ---------------
 .../resources/conf/ddl/postgres/test_data.sql    | 16 ----------------
 4 files changed, 63 deletions(-)

diff --git a/cuebot/src/main/resources/conf/ddl/oracle/demo_data.sql b/cuebot/src/main/resources/conf/ddl/oracle/demo_data.sql
index a62190f09..fc97a477f 100644
--- a/cuebot/src/main/resources/conf/ddl/oracle/demo_data.sql
+++ b/cuebot/src/main/resources/conf/ddl/oracle/demo_data.sql
@@ -70,25 +70,9 @@ Insert into SERVICE (PK_SERVICE,STR_NAME,B_THREADABLE,INT_CORES_MIN,INT_MEM_MIN,
 -- SPLIT HERE!
 Insert into SERVICE (PK_SERVICE,STR_NAME,B_THREADABLE,INT_CORES_MIN,INT_MEM_MIN,STR_TAGS) values ('AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAA12','postprocess',0,10,524288,'util')
 
--- SPLIT HERE!
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000000','MAX_PING_TIME',300,0,null,0)
--- SPLIT HERE!
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000001','MIN_CORES_REQUIRED',10,0,null,0)
--- SPLIT HERE!
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000002','MIN_MEM_REQUIRED',0,500000,null,0)
--- SPLIT HERE!
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000003','MAX_PPS',0,20,null,0)
 -- SPLIT HERE!
 Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000005','MAX_FRAME_RETRIES',16,0,null,0)
--- SPLIT HERE!
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000006','MAX_LAYER_COUNT_PER_JOB',250,0,null,0)
--- SPLIT HERE!
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000007','MAX_FRAME_COUNT_PER_JOB',0,250000,null,0)
--- SPLIT HERE!
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000008','DEFAULT_FRAME_RETRIES',2,0,null,0)
 
--- SPLIT HERE!
-Insert into TASK_LOCK (PK_TASK_LOCK,STR_NAME,INT_LOCK,INT_TIMEOUT) values ('00000000-0000-0000-0000-000000000004','LOCK_SHOW_ALERTS',0,300)
 -- SPLIT HERE!
 Insert into TASK_LOCK (PK_TASK_LOCK,STR_NAME,INT_LOCK,INT_TIMEOUT) values ('00000000-0000-0000-0000-000000000002','LOCK_HARDWARE_STATE_CHECK',0,30)
 -- SPLIT HERE!
diff --git a/cuebot/src/main/resources/conf/ddl/postgres/demo_data.sql b/cuebot/src/main/resources/conf/ddl/postgres/demo_data.sql
index 2f8b89f4e..ab2787dca 100644
--- a/cuebot/src/main/resources/conf/ddl/postgres/demo_data.sql
+++ b/cuebot/src/main/resources/conf/ddl/postgres/demo_data.sql
@@ -72,24 +72,8 @@ Insert into SERVICE (PK_SERVICE,STR_NAME,B_THREADABLE,INT_CORES_MIN,INT_MEM_MIN,
 Insert into SERVICE (PK_SERVICE,STR_NAME,B_THREADABLE,INT_CORES_MIN,INT_MEM_MIN,STR_TAGS) values ('AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAA12','postprocess',false,10,524288,'util');
 
 
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000000','MAX_PING_TIME',300,0,null,false);
-
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000001','MIN_CORES_REQUIRED',10,0,null,false);
-
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000002','MIN_MEM_REQUIRED',0,500000,null,false);
-
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000003','MAX_PPS',0,20,null,false);
-
 Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000005','MAX_FRAME_RETRIES',16,0,null,false);
 
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000006','MAX_LAYER_COUNT_PER_JOB',250,0,null,false);
-
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000007','MAX_FRAME_COUNT_PER_JOB',0,250000,null,false);
-
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000008','DEFAULT_FRAME_RETRIES',2,0,null,false);
-
-
-Insert into TASK_LOCK (PK_TASK_LOCK,STR_NAME,INT_LOCK,INT_TIMEOUT) values ('00000000-0000-0000-0000-000000000004','LOCK_SHOW_ALERTS',0,300);
 
 Insert into TASK_LOCK (PK_TASK_LOCK,STR_NAME,INT_LOCK,INT_TIMEOUT) values ('00000000-0000-0000-0000-000000000002','LOCK_HARDWARE_STATE_CHECK',0,30);
 
diff --git a/cuebot/src/test/resources/conf/ddl/oracle/test_data.sql b/cuebot/src/test/resources/conf/ddl/oracle/test_data.sql
index 37713d006..bdc0e4c8f 100644
--- a/cuebot/src/test/resources/conf/ddl/oracle/test_data.sql
+++ b/cuebot/src/test/resources/conf/ddl/oracle/test_data.sql
@@ -105,24 +105,9 @@ Insert into SERVICE (PK_SERVICE,STR_NAME,B_THREADABLE,INT_CORES_MIN,INT_MEM_MIN,
 Insert into SERVICE (PK_SERVICE,STR_NAME,B_THREADABLE,INT_CORES_MIN,INT_MEM_MIN,STR_TAGS,INT_CORES_MAX,INT_GPU_MIN) values ('488c75f0-eae4-4dd0-83e0-29b982adbbff','cuda',1,100,3354624,'cuda',0,262144)
 -- SPLIT HERE!
 
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000000','MAX_PING_TIME',300,0,null,0)
--- SPLIT HERE!
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000001','MIN_CORES_REQUIRED',10,0,null,0)
--- SPLIT HERE!
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000002','MIN_MEM_REQUIRED',0,500000,null,0)
--- SPLIT HERE!
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000003','MAX_PPS',0,20,null,0)
 -- SPLIT HERE!
 Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000005','MAX_FRAME_RETRIES',16,0,null,0)
--- SPLIT HERE!
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000006','MAX_LAYER_COUNT_PER_JOB',250,0,null,0)
--- SPLIT HERE!
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000007','MAX_FRAME_COUNT_PER_JOB',0,250000,null,0)
--- SPLIT HERE!
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000008','DEFAULT_FRAME_RETRIES',2,0,null,0)
--- SPLIT HERE!
 
-Insert into TASK_LOCK (PK_TASK_LOCK,STR_NAME,INT_LOCK,INT_TIMEOUT) values ('00000000-0000-0000-0000-000000000004','LOCK_SHOW_ALERTS',0,300)
 -- SPLIT HERE!
 Insert into TASK_LOCK (PK_TASK_LOCK,STR_NAME,INT_LOCK,INT_TIMEOUT) values ('00000000-0000-0000-0000-000000000002','LOCK_HARDWARE_STATE_CHECK',0,30)
 -- SPLIT HERE!
diff --git a/cuebot/src/test/resources/conf/ddl/postgres/test_data.sql b/cuebot/src/test/resources/conf/ddl/postgres/test_data.sql
index 9907b22ff..b5596b91d 100644
--- a/cuebot/src/test/resources/conf/ddl/postgres/test_data.sql
+++ b/cuebot/src/test/resources/conf/ddl/postgres/test_data.sql
@@ -105,24 +105,8 @@ Insert into SERVICE (PK_SERVICE,STR_NAME,B_THREADABLE,INT_CORES_MIN,INT_MEM_MIN,
 Insert into SERVICE (PK_SERVICE,STR_NAME,B_THREADABLE,INT_CORES_MIN,INT_MEM_MIN,STR_TAGS,INT_CORES_MAX,INT_GPU_MIN) values ('488c75f0-eae4-4dd0-83e0-29b982adbbff','cuda',true,100,3354624,'cuda',0,262144)
 
 
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000000','MAX_PING_TIME',300,0,null,false)
-
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000001','MIN_CORES_REQUIRED',10,0,null,false)
-
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000002','MIN_MEM_REQUIRED',0,500000,null,false)
-
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000003','MAX_PPS',0,20,null,false)
-
 Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000005','MAX_FRAME_RETRIES',16,0,null,false)
 
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000006','MAX_LAYER_COUNT_PER_JOB',250,0,null,false)
-
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000007','MAX_FRAME_COUNT_PER_JOB',0,250000,null,false)
-
-Insert into CONFIG (PK_CONFIG,STR_KEY,INT_VALUE,LONG_VALUE,STR_VALUE,B_VALUE) values ('00000000-0000-0000-0000-000000000008','DEFAULT_FRAME_RETRIES',2,0,null,false)
-
-
-Insert into TASK_LOCK (PK_TASK_LOCK,STR_NAME,INT_LOCK,INT_TIMEOUT) values ('00000000-0000-0000-0000-000000000004','LOCK_SHOW_ALERTS',0,300)
 
 Insert into TASK_LOCK (PK_TASK_LOCK,STR_NAME,INT_LOCK,INT_TIMEOUT) values ('00000000-0000-0000-0000-000000000002','LOCK_HARDWARE_STATE_CHECK',0,30)