From 60ace6479e671aeab4b653ff5dd54a28b5ea841a Mon Sep 17 00:00:00 2001 From: motodiary Date: Fri, 7 Jun 2024 09:45:28 +0800 Subject: [PATCH] Remove comments in concatenated strings --- ...ove-comments-in-concatenated-strings.patch | 43 +++++++++++++++++++ slurm.spec | 6 ++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 0045-Remove-comments-in-concatenated-strings.patch diff --git a/0045-Remove-comments-in-concatenated-strings.patch b/0045-Remove-comments-in-concatenated-strings.patch new file mode 100644 index 0000000..d3aced6 --- /dev/null +++ b/0045-Remove-comments-in-concatenated-strings.patch @@ -0,0 +1,43 @@ +From bcfde72bbc79d5d210ff62f37a1642b296cd2a2d Mon Sep 17 00:00:00 2001 +From: motodiary +Date: Fri, 7 Jun 2024 09:40:01 +0800 +Subject: [PATCH] Remove comments in concatenated strings + +--- + src/plugins/accounting_storage/pgsql/as_pgsql_assoc.c | 6 +----- + src/plugins/accounting_storage/pgsql/as_pgsql_qos.c | 1 - + 2 files changed, 1 insertion(+), 6 deletions(-) + +diff --git a/src/plugins/accounting_storage/pgsql/as_pgsql_assoc.c b/src/plugins/accounting_storage/pgsql/as_pgsql_assoc.c +index c5eadf0..dd91b8e 100755 +--- a/src/plugins/accounting_storage/pgsql/as_pgsql_assoc.c ++++ b/src/plugins/accounting_storage/pgsql/as_pgsql_assoc.c +@@ -3672,12 +3672,8 @@ extern int as_pgsql_reset_lft_rgt(pgsql_conn_t *pgsql_conn, uid_t uid, + "(creation_time, mod_time, acct, lft, rgt) " + "values (%ld, %ld, 'root', 1, 2) " + "on conflict(id_assoc) do update set deleted=0, " +-// "id_assoc=currval(pg_get_serial_sequence('%s_%s', 'id_assoc')), " + "mod_time=%ld;", +- tmp_cluster_name, assoc_table, now, now, +-// tmp_cluster_name, assoc_table, +- now); +- ++ tmp_cluster_name, assoc_table, now, now, now); + + DB_DEBUG(DB_ASSOC, pgsql_conn->conn, "query\n%s", query); + +diff --git a/src/plugins/accounting_storage/pgsql/as_pgsql_qos.c b/src/plugins/accounting_storage/pgsql/as_pgsql_qos.c +index 0ff9180..0a7733d 100755 +--- a/src/plugins/accounting_storage/pgsql/as_pgsql_qos.c ++++ b/src/plugins/accounting_storage/pgsql/as_pgsql_qos.c +@@ -689,7 +689,6 @@ extern int as_pgsql_add_qos(pgsql_conn_t *pgsql_conn, uint32_t uid, + xstrfmtcat(query, + "INSERT INTO %s (%s) VALUES (%s) " + "ON CONFLICT (id) DO UPDATE SET deleted=0%s;", +-// "id=CURRVAL(pg_get_serial_sequence('%s', 'id'))%s;", + qos_table, cols, vals, extra); + + +-- +2.33.0 + diff --git a/slurm.spec b/slurm.spec index 3e598c2..0e3e7c0 100644 --- a/slurm.spec +++ b/slurm.spec @@ -1,6 +1,6 @@ Name: slurm Version: 21.08.8 -%define rel 47 +%define rel 48 Release: %{rel}%{?dist} Summary: Slurm Workload Manager @@ -60,6 +60,7 @@ Patch41: 0041-Fix-compilation-warnings.patch Patch42: 0042-Change-the-serial-type-to-integer.patch Patch43: 0043-Remove-redundant-tres_table-fields.patch Patch44: 0044-replace-goto-fini.patch +Patch45: 0045-Remove-comments-in-concatenated-strings.patch # build options .rpmmacros options change to default action # ==================== ==================== ======================== @@ -752,6 +753,9 @@ rm -rf %{buildroot} %systemd_postun_with_restart slurmdbd.service %changelog +* Fri Jun 07 2024 Xing Liu - 21.08.8-48 +- Remove comments in concatenated strings + * Thu Jun 06 2024 Xing Liu - 21.08.8-47 - replace goto fini -- Gitee