From 8dc2c52ae77be27488cb6bb37271d831d83fdc0c Mon Sep 17 00:00:00 2001
From: Liz Baldo <lizbaldo@Liz-Baldo-H5267Y2XDX.local>
Date: Tue, 25 Nov 2025 10:14:18 -0500
Subject: [PATCH 1/5] migrate job key value entry id from int to bigint

---
 .../src/main/resources/changelog.xml          |  1 +
 .../enlarge_job_key_value_entry_id.xml        | 50 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 database/migration/src/main/resources/changesets/enlarge_job_key_value_entry_id.xml

diff --git a/database/migration/src/main/resources/changelog.xml b/database/migration/src/main/resources/changelog.xml
index 81036465176..6e6887f003f 100644
--- a/database/migration/src/main/resources/changelog.xml
+++ b/database/migration/src/main/resources/changelog.xml
@@ -93,6 +93,7 @@
     <include file="changesets/workflow_store_drop_state_index.xml" relativeToChangelogFile="true" />
     <include file="changesets/add_group_metrics_table.xml" relativeToChangelogFile="true" />
     <include file="changesets/add_group_metrics_unique_constraint.xml" relativeToChangelogFile="true" />
+    <include file="changesets/enlarge_job_key_value_entry_id.xml" relativeToChangelogFile="true" />
     <!-- WARNING!
       This changeset should always be last.
       It is always run (and should always run last) to set table ownership correctly.
diff --git a/database/migration/src/main/resources/changesets/enlarge_job_key_value_entry_id.xml b/database/migration/src/main/resources/changesets/enlarge_job_key_value_entry_id.xml
new file mode 100644
index 00000000000..306d660299e
--- /dev/null
+++ b/database/migration/src/main/resources/changesets/enlarge_job_key_value_entry_id.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog objectQuotingStrategy="QUOTE_ALL_OBJECTS"
+                   xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.3.xsd">
+
+    <!-- BEGIN JOB_KEY_VALUE_ENTRY PK widening -->
+    <!-- For HSQLDB and Postgres database there are 2 changesets: one for modifying the table column type, and another one for altering the autoincrementing sequence.
+         The other DBs can be refactored similarly with a single addAutoIncrement changeset. The start of autoincrement is set at 20,000,000,000. -->
+    <changeSet author="lbaldo" id="enlarge_job_key_value_entry_id" dbms="hsqldb">
+        <modifyDataType
+                columnName="JOB_KEY_VALUE_ENTRY_ID"
+                tableName="JOB_KEY_VALUE_ENTRY"
+                newDataType="BIGINT"
+        />
+    </changeSet>
+
+    <changeSet author="lbaldo" id="reset_job_key_value_entry_id" dbms="mysql,hsqldb,mariadb">
+        <addAutoIncrement
+                columnName="JOB_KEY_VALUE_ENTRY_ID"
+                columnDataType="BIGINT"
+                incrementBy="1"
+                startWith="20000000000"
+                tableName="JOB_KEY_VALUE_ENTRY"
+        />
+    </changeSet>
+
+    <changeSet author="lbaldo" id="postgresql_enlarge_job_key_value_entry_id" dbms="postgresql">
+        <modifyDataType
+                columnName="JOB_KEY_VALUE_ENTRY_ID"
+                tableName="JOB_KEY_VALUE_ENTRY"
+                newDataType="BIGINT"
+        />
+    </changeSet>
+
+    <changeSet author="lbaldo" id="postgresql_enlarge_call_caching_detritus_entry_id_seq" dbms="postgresql">
+        <preConditions onFail="MARK_RAN">
+            <!-- idempotency check (noop if the sequence is present and already consistent what the alter would do) -->
+            <sqlCheck expectedResult="0">
+                SELECT count(*)
+                FROM information_schema.sequences
+                WHERE sequence_name = 'JOB_KEY_VALUE_ENTRY_JOB_KEY_VALUE_ENTRY_ID_seq'
+                AND data_type = 'bigint';
+            </sqlCheck>
+        </preConditions>
+        <sql>ALTER SEQUENCE "JOB_KEY_VALUE_ENTRY_JOB_KEY_VALUE_ENTRY_ID_seq" as bigint RESTART WITH 20000000000;</sql>
+    </changeSet>
+    <!-- END JOB_KEY_VALUE_ENTRY PK widening -->
+
+</databaseChangeLog>

From 85c6f6f16fd8d0609fca323b097a31dae2f40060 Mon Sep 17 00:00:00 2001
From: Liz Baldo <lizbaldo@Liz-Baldo-H5267Y2XDX.local>
Date: Tue, 25 Nov 2025 12:39:15 -0500
Subject: [PATCH 2/5] simplify migration

---
 .../changesets/enlarge_job_key_value_entry_id.xml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/database/migration/src/main/resources/changesets/enlarge_job_key_value_entry_id.xml b/database/migration/src/main/resources/changesets/enlarge_job_key_value_entry_id.xml
index 306d660299e..3a3480b3a32 100644
--- a/database/migration/src/main/resources/changesets/enlarge_job_key_value_entry_id.xml
+++ b/database/migration/src/main/resources/changesets/enlarge_job_key_value_entry_id.xml
@@ -7,20 +7,11 @@
     <!-- BEGIN JOB_KEY_VALUE_ENTRY PK widening -->
     <!-- For HSQLDB and Postgres database there are 2 changesets: one for modifying the table column type, and another one for altering the autoincrementing sequence.
          The other DBs can be refactored similarly with a single addAutoIncrement changeset. The start of autoincrement is set at 20,000,000,000. -->
-    <changeSet author="lbaldo" id="enlarge_job_key_value_entry_id" dbms="hsqldb">
-        <modifyDataType
-                columnName="JOB_KEY_VALUE_ENTRY_ID"
-                tableName="JOB_KEY_VALUE_ENTRY"
-                newDataType="BIGINT"
-        />
-    </changeSet>
-
-    <changeSet author="lbaldo" id="reset_job_key_value_entry_id" dbms="mysql,hsqldb,mariadb">
+    <changeSet author="lbaldo" id="enlarge_job_key_value_entry_id" dbms="mysql,hsqldb,mariadb">
         <addAutoIncrement
                 columnName="JOB_KEY_VALUE_ENTRY_ID"
                 columnDataType="BIGINT"
                 incrementBy="1"
-                startWith="20000000000"
                 tableName="JOB_KEY_VALUE_ENTRY"
         />
     </changeSet>
@@ -33,7 +24,7 @@
         />
     </changeSet>
 
-    <changeSet author="lbaldo" id="postgresql_enlarge_call_caching_detritus_entry_id_seq" dbms="postgresql">
+    <changeSet author="lbaldoh" id="postgresql_enlarge_job_key_value_entry_id_seq" dbms="postgresql">
         <preConditions onFail="MARK_RAN">
             <!-- idempotency check (noop if the sequence is present and already consistent what the alter would do) -->
             <sqlCheck expectedResult="0">
@@ -43,7 +34,7 @@
                 AND data_type = 'bigint';
             </sqlCheck>
         </preConditions>
-        <sql>ALTER SEQUENCE "JOB_KEY_VALUE_ENTRY_JOB_KEY_VALUE_ENTRY_ID_seq" as bigint RESTART WITH 20000000000;</sql>
+        <sql>alter sequence "JOB_KEY_VALUE_ENTRY_JOB_KEY_VALUE_ENTRY_ID_seq" as bigint;</sql>
     </changeSet>
     <!-- END JOB_KEY_VALUE_ENTRY PK widening -->
 

From 440884f2c101aeb0a6ceafa5fbdfeb4bd1527676 Mon Sep 17 00:00:00 2001
From: Liz Baldo <lizbaldo@Liz-Baldo-H5267Y2XDX.local>
Date: Tue, 25 Nov 2025 12:44:55 -0500
Subject: [PATCH 3/5] add changelog and corresponding Scala type change

---
 CHANGELOG.md                                                   | 3 +++
 .../database/slick/tables/JobKeyValueEntryComponent.scala      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 249775fb311..5462b36003a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## 92 Release Notes
 
+### Migration of PK to BIGINT
+The PK of the JOB_KEY_VALUE_ENTRY table will be migrated from INT to BIGINT.
+
 ### AWS Batch
 * Moved the option to tag job resources from runtime attributes to backend config.
 * Appended the custom labels to the list of resource tags to propagate
diff --git a/database/sql/src/main/scala/cromwell/database/slick/tables/JobKeyValueEntryComponent.scala b/database/sql/src/main/scala/cromwell/database/slick/tables/JobKeyValueEntryComponent.scala
index cd730a5c154..82889fc3c3a 100644
--- a/database/sql/src/main/scala/cromwell/database/slick/tables/JobKeyValueEntryComponent.scala
+++ b/database/sql/src/main/scala/cromwell/database/slick/tables/JobKeyValueEntryComponent.scala
@@ -9,7 +9,7 @@ trait JobKeyValueEntryComponent {
   import driver.api._
 
   class JobKeyValueEntries(tag: Tag) extends Table[JobKeyValueEntry](tag, "JOB_KEY_VALUE_ENTRY") {
-    def jobKeyValueEntryId = column[Int]("JOB_KEY_VALUE_ENTRY_ID", O.PrimaryKey, O.AutoInc)
+    def jobKeyValueEntryId = column[Long]("JOB_KEY_VALUE_ENTRY_ID", O.PrimaryKey, O.AutoInc)
 
     def workflowExecutionUuid = column[String]("WORKFLOW_EXECUTION_UUID", O.Length(255))
 

From c4d32575fba8e983474410d4ca5b294bc375e867 Mon Sep 17 00:00:00 2001
From: Liz Baldo <lizbaldo@Liz-Baldo-H5267Y2XDX.local>
Date: Tue, 25 Nov 2025 15:13:24 -0500
Subject: [PATCH 4/5] one more scala type fix

---
 .../scala/cromwell/database/sql/tables/JobKeyValueEntry.scala   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/sql/src/main/scala/cromwell/database/sql/tables/JobKeyValueEntry.scala b/database/sql/src/main/scala/cromwell/database/sql/tables/JobKeyValueEntry.scala
index 8b768ff66de..a517dccbe6f 100644
--- a/database/sql/src/main/scala/cromwell/database/sql/tables/JobKeyValueEntry.scala
+++ b/database/sql/src/main/scala/cromwell/database/sql/tables/JobKeyValueEntry.scala
@@ -7,5 +7,5 @@ case class JobKeyValueEntry(
   jobAttempt: Int,
   storeKey: String,
   storeValue: String,
-  jobKeyValueEntryId: Option[Int] = None
+  jobKeyValueEntryId: Option[Long] = None
 )

From 4fe3f66426abfdffcd5b195fc99a17953ba79387 Mon Sep 17 00:00:00 2001
From: Liz Baldo <lizbaldo@Liz-Baldo-H5267Y2XDX.local>
Date: Tue, 2 Dec 2025 09:17:12 -0500
Subject: [PATCH 5/5] fix comment

---
 .../resources/changesets/enlarge_job_key_value_entry_id.xml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/database/migration/src/main/resources/changesets/enlarge_job_key_value_entry_id.xml b/database/migration/src/main/resources/changesets/enlarge_job_key_value_entry_id.xml
index 3a3480b3a32..b9d1c51da8a 100644
--- a/database/migration/src/main/resources/changesets/enlarge_job_key_value_entry_id.xml
+++ b/database/migration/src/main/resources/changesets/enlarge_job_key_value_entry_id.xml
@@ -5,8 +5,8 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.3.xsd">
 
     <!-- BEGIN JOB_KEY_VALUE_ENTRY PK widening -->
-    <!-- For HSQLDB and Postgres database there are 2 changesets: one for modifying the table column type, and another one for altering the autoincrementing sequence.
-         The other DBs can be refactored similarly with a single addAutoIncrement changeset. The start of autoincrement is set at 20,000,000,000. -->
+    <!-- For Postgresql there are 2 changesets: one for modifying the table column type, and another one for altering the autoincrementing sequence.
+              The other DBs can be refactored similarly with a single addAutoIncrement changeset. -->
     <changeSet author="lbaldo" id="enlarge_job_key_value_entry_id" dbms="mysql,hsqldb,mariadb">
         <addAutoIncrement
                 columnName="JOB_KEY_VALUE_ENTRY_ID"