From 5149518e7a05db4464eef7b089e07b663c06ba41 Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Thu, 28 Dec 2023 10:04:02 +0100
Subject: [PATCH] sql: Remove unused group_jobs_restarted column

---
 mxq_group.c                                       | 5 +----
 mxq_group.h                                       | 2 --
 mysql/create_tables.sql                           | 2 --
 mysql/migrate_017_remove_group_jobs_restarted.sql | 2 ++
 web/pages/mxq/mxq.in                              | 1 -
 5 files changed, 3 insertions(+), 9 deletions(-)
 create mode 100644 mysql/migrate_017_remove_group_jobs_restarted.sql

diff --git a/mxq_group.c b/mxq_group.c
index 8d44c363..d34a575a 100644
--- a/mxq_group.c
+++ b/mxq_group.c
@@ -11,7 +11,7 @@
 #include "mx_util.h"
 #include "mx_mysql.h"
 
-#define GROUP_FIELDS_CNT 37
+#define GROUP_FIELDS_CNT 36
 #define GROUP_FIELDS \
             " group_id," \
             " group_name," \
@@ -40,7 +40,6 @@
             " group_jobs_failed," \
             " group_jobs_cancelled," \
             " group_jobs_unknown," \
-            " group_jobs_restarted," \
             " group_slots_running," \
             " stats_max_sumrss," \
             " stats_max_maxrss," \
@@ -91,8 +90,6 @@ static void bind_result_group_fields(struct mx_mysql_bind *result, struct mxq_gr
     mx_mysql_bind_var(result, idx++, uint64, &(g->group_jobs_cancelled));
     mx_mysql_bind_var(result, idx++, uint64, &(g->group_jobs_unknown));
 
-    mx_mysql_bind_var(result, idx++, uint64, &(g->group_jobs_restarted));
-
     mx_mysql_bind_var(result, idx++, uint64, &(g->group_slots_running));
 
     mx_mysql_bind_var(result, idx++, uint64, &(g->stats_max_sumrss));
diff --git a/mxq_group.h b/mxq_group.h
index a72e1580..d0f32663 100644
--- a/mxq_group.h
+++ b/mxq_group.h
@@ -43,8 +43,6 @@ struct mxq_group {
    uint64_t  group_jobs_cancelled;
    uint64_t  group_jobs_unknown;
 
-   uint64_t  group_jobs_restarted;
-
    uint64_t  group_slots_running;
 
    uint64_t  stats_max_sumrss;
diff --git a/mysql/create_tables.sql b/mysql/create_tables.sql
index cd0c553b..3b2bcd06 100644
--- a/mysql/create_tables.sql
+++ b/mysql/create_tables.sql
@@ -31,8 +31,6 @@ CREATE TABLE IF NOT EXISTS mxq_group (
    group_jobs_cancelled INT8 UNSIGNED NOT NULL DEFAULT 0,
    group_jobs_unknown   INT8 UNSIGNED NOT NULL DEFAULT 0,
 
-   group_jobs_restarted INT8 UNSIGNED NOT NULL DEFAULT 0,
-
    group_slots_running  INT8 UNSIGNED NOT NULL DEFAULT 0,
 
    group_mtime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
diff --git a/mysql/migrate_017_remove_group_jobs_restarted.sql b/mysql/migrate_017_remove_group_jobs_restarted.sql
new file mode 100644
index 00000000..b8a91756
--- /dev/null
+++ b/mysql/migrate_017_remove_group_jobs_restarted.sql
@@ -0,0 +1,2 @@
+ALTER TABLE mxq_group
+	DROP COLUMN group_jobs_restarted;
diff --git a/web/pages/mxq/mxq.in b/web/pages/mxq/mxq.in
index 6d50c80f..1aecc0ea 100755
--- a/web/pages/mxq/mxq.in
+++ b/web/pages/mxq/mxq.in
@@ -407,7 +407,6 @@ group_jobs_finished   : $o->{group_jobs_finished}
 group_jobs_failed     : $o->{group_jobs_failed}
 group_jobs_cancelled  : $o->{group_jobs_cancelled}
 group_jobs_unknown    : $o->{group_jobs_unknown}
-group_jobs_restarted  : $o->{group_jobs_restarted}
 
 group_slots_running:  : $o->{group_slots_running}