From eb65bb8764e56b517b2a49fb396ba45ef57be222 Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Tue, 29 Oct 2024 12:47:17 -0500
Subject: [PATCH 1/3] [24.0] Fetch invocation id only once on the job info page

... instead of polling while the job is non terminal; we only need the id once.

Fixes https://github.com/galaxyproject/galaxy/issues/18921
---
 client/src/components/JobInformation/JobInformation.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/components/JobInformation/JobInformation.vue b/client/src/components/JobInformation/JobInformation.vue
index 759e59b97418..7d1cade4942a 100644
--- a/client/src/components/JobInformation/JobInformation.vue
+++ b/client/src/components/JobInformation/JobInformation.vue
@@ -41,7 +41,7 @@ const metadataDetail = ref({
 
 function updateJob(newJob) {
     job.value = newJob;
-    if (newJob) {
+    if (newJob && !invocationId.value) {
         fetchInvocation(newJob.id);
     }
 }
@@ -57,6 +57,7 @@ function filterMetadata(jobMessages) {
     });
 }
 
+/** Fetches the invocation for the given job id to get the associated invocation id */
 async function fetchInvocation(jobId) {
     if (jobId) {
         const invocation = await invocationForJob({ jobId: jobId });

From 2cae82cfa9fd7a7f6fcd0dd1a436579490214837 Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Wed, 30 Oct 2024 13:27:01 -0500
Subject: [PATCH 2/3] use a watcher to fetch invocation id just once

---
 .../JobInformation/JobInformation.vue         | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/client/src/components/JobInformation/JobInformation.vue b/client/src/components/JobInformation/JobInformation.vue
index 7d1cade4942a..3c0c8d407695 100644
--- a/client/src/components/JobInformation/JobInformation.vue
+++ b/client/src/components/JobInformation/JobInformation.vue
@@ -5,7 +5,7 @@ import { JobDetailsProvider } from "components/providers/JobProvider";
 import UtcDate from "components/UtcDate";
 import { formatDuration, intervalToDuration } from "date-fns";
 import JOB_STATES_MODEL from "utils/job-states-model";
-import { computed, ref } from "vue";
+import { computed, ref, watch } from "vue";
 
 import { invocationForJob } from "@/api/invocations";
 
@@ -13,7 +13,7 @@ import DecodedId from "../DecodedId.vue";
 import CodeRow from "./CodeRow.vue";
 
 const job = ref(null);
-const invocationId = ref(null);
+const invocationId = ref(undefined);
 
 const props = defineProps({
     job_id: {
@@ -41,9 +41,6 @@ const metadataDetail = ref({
 
 function updateJob(newJob) {
     job.value = newJob;
-    if (newJob && !invocationId.value) {
-        fetchInvocation(newJob.id);
-    }
 }
 
 function filterMetadata(jobMessages) {
@@ -57,15 +54,21 @@ function filterMetadata(jobMessages) {
     });
 }
 
-/** Fetches the invocation for the given job id to get the associated invocation id */
-async function fetchInvocation(jobId) {
-    if (jobId) {
-        const invocation = await invocationForJob({ jobId: jobId });
-        if (invocation) {
-            invocationId.value = invocation.id;
+// Fetches the invocation for the given job id to get the associated invocation id
+watch(
+    () => props.job_id,
+    async (newId, oldId) => {
+        if (newId && (invocationId.value === undefined || newId !== oldId)) {
+            const invocation = await invocationForJob({ jobId: newId });
+            if (invocation) {
+                invocationId.value = invocation.id;
+            } else {
+                invocationId.value = null;
+            }
         }
-    }
-}
+    },
+    { immediate: true }
+);
 </script>
 
 <template>

From 71e499bb7864acf9ca381a02ed923aa9535d62bb Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Tue, 5 Nov 2024 11:34:42 +0100
Subject: [PATCH 3/3] Optimize/fix sqlite hid update statement

`./run_tests.sh --skip-common-startup -api lib/galaxy_test/api -- -s -k
cache` would fail on sqlite with database locked.

Not using a separate connection means that we expire loaded attributes
in the sqlite case, but I don't think we need to be concerned about
performance if you're using sqlite.
---
 lib/galaxy/model/__init__.py | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
index 582da171d315..12d2a554512d 100644
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -91,7 +91,10 @@
     update,
     VARCHAR,
 )
-from sqlalchemy.exc import OperationalError
+from sqlalchemy.exc import (
+    CompileError,
+    OperationalError,
+)
 from sqlalchemy.ext import hybrid
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.orderinglist import ordering_list
@@ -3120,16 +3123,21 @@ def _next_hid(self, n=1):
         table = self.__table__
         history_id = cached_id(self)
         update_stmt = update(table).where(table.c.id == history_id).values(hid_counter=table.c.hid_counter + n)
+        update_returning_stmnt = update_stmt.returning(table.c.hid_counter)
 
-        with engine.begin() as conn:
-            if engine.name in ["postgres", "postgresql"]:
-                stmt = update_stmt.returning(table.c.hid_counter)
-                updated_hid = conn.execute(stmt).scalar()
-                hid = updated_hid - n
-            else:
-                select_stmt = select(table.c.hid_counter).where(table.c.id == history_id).with_for_update()
-                hid = conn.execute(select_stmt).scalar()
-                conn.execute(update_stmt)
+        if engine.name != "sqlite":
+            with engine.begin() as conn:
+                hid = conn.execute(update_returning_stmnt).scalar() - n
+        else:
+            try:
+                hid = session.execute(update_returning_stmnt).scalar() - n
+            except (CompileError, OperationalError):
+                # The RETURNING clause was added to SQLite in version 3.35.0.
+                # Not using FOR UPDATE either, since that was added in 3.45.0,
+                # and anyway does a whole-table lock
+                select_stmt = select(table.c.hid_counter).where(table.c.id == history_id)
+                hid = session.execute(select_stmt).scalar()
+                session.execute(update_stmt)
 
         session.expire(self, ["hid_counter"])
         return hid