From 3b6313b1d6a82195d411d4a8e80a5cb266ce6e9e Mon Sep 17 00:00:00 2001 From: Saloni Shah Date: Mon, 12 Sep 2022 18:44:00 -0400 Subject: [PATCH 1/4] [force ci] enlarge PKs --- CHANGELOG.md | 10 +++ .../src/main/resources/changelog.xml | 3 + .../enlarge_docker_hash_store_entry_id.xml | 41 ++++++++++ .../enlarge_sub_workflow_store_entry_id.xml | 41 ++++++++++ .../enlarge_workflow_store_entry_id.xml | 81 +++++++++++++++++++ 5 files changed, 176 insertions(+) create mode 100644 database/migration/src/main/resources/changesets/enlarge_docker_hash_store_entry_id.xml create mode 100644 database/migration/src/main/resources/changesets/enlarge_sub_workflow_store_entry_id.xml create mode 100644 database/migration/src/main/resources/changesets/enlarge_workflow_store_entry_id.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index e1158be3ca4..4dcab0dfa3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Cromwell Change Log +## 85 Release Notes + +### Migration of PKs to BIGINT + +The PK of below tables will be migrated from INT to BIGINT. Also, since `ROOT_WORKFLOW_ID` in `SUB_WORKFLOW_STORE_ENTRY` is a FK to `WORKFLOW_STORE_ENTRY_ID` in `WORKFLOW_STORE_ENTRY` +it is also being migrated from INT to BIGINT. +* DOCKER_HASH_STORE_ENTRY +* WORKFLOW_STORE_ENTRY +* SUB_WORKFLOW_STORE_ENTRY + ## 84 Release Notes ### CromIAM enabled user checks diff --git a/database/migration/src/main/resources/changelog.xml b/database/migration/src/main/resources/changelog.xml index 5d711061c31..49d568766b3 100644 --- a/database/migration/src/main/resources/changelog.xml +++ b/database/migration/src/main/resources/changelog.xml @@ -87,6 +87,9 @@ + + + diff --git a/database/migration/src/main/resources/changesets/enlarge_docker_hash_store_entry_id.xml b/database/migration/src/main/resources/changesets/enlarge_docker_hash_store_entry_id.xml new file mode 100644 index 00000000000..fdeff0da5db --- /dev/null +++ b/database/migration/src/main/resources/changesets/enlarge_docker_hash_store_entry_id.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + SELECT count(*) + FROM information_schema.sequences + WHERE sequence_name = 'DOCKER_HASH_STORE_ENTRY_DOCKER_HASH_STORE_ENTRY_ID_seq' + AND data_type = 'bigint'; + + + alter sequence "DOCKER_HASH_STORE_ENTRY_DOCKER_HASH_STORE_ENTRY_ID_seq" as bigint; + + + + \ No newline at end of file diff --git a/database/migration/src/main/resources/changesets/enlarge_sub_workflow_store_entry_id.xml b/database/migration/src/main/resources/changesets/enlarge_sub_workflow_store_entry_id.xml new file mode 100644 index 00000000000..7c62af5131e --- /dev/null +++ b/database/migration/src/main/resources/changesets/enlarge_sub_workflow_store_entry_id.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + SELECT count(*) + FROM information_schema.sequences + WHERE sequence_name = 'SUB_WORKFLOW_STORE_ENTRY_SUB_WORKFLOW_STORE_ENTRY_ID_seq' + AND data_type = 'bigint'; + + + alter sequence "SUB_WORKFLOW_STORE_ENTRY_SUB_WORKFLOW_STORE_ENTRY_ID_seq" as bigint; + + + + \ No newline at end of file diff --git a/database/migration/src/main/resources/changesets/enlarge_workflow_store_entry_id.xml b/database/migration/src/main/resources/changesets/enlarge_workflow_store_entry_id.xml new file mode 100644 index 00000000000..00709f5b991 --- /dev/null +++ b/database/migration/src/main/resources/changesets/enlarge_workflow_store_entry_id.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + SELECT count(*) + FROM information_schema.sequences + WHERE sequence_name = 'WORKFLOW_STORE_ENTRY_WORKFLOW_STORE_ENTRY_ID_seq' + AND data_type = 'bigint'; + + + alter sequence "WORKFLOW_STORE_ENTRY_WORKFLOW_STORE_ENTRY_ID_seq" as bigint; + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From cbf032585eac50731e6351bef28b43b002343c57 Mon Sep 17 00:00:00 2001 From: Saloni Shah Date: Tue, 13 Sep 2022 09:48:31 -0400 Subject: [PATCH 2/4] [force ci] fix expectations --- .../slick/tables/DockerHashStoreEntryComponent.scala | 2 +- .../slick/tables/SubWorkflowStoreEntryComponent.scala | 6 +++--- .../database/slick/tables/WorkflowStoreEntryComponent.scala | 2 +- .../cromwell/database/sql/tables/DockerHashStoreEntry.scala | 2 +- .../database/sql/tables/SubWorkflowStoreEntry.scala | 4 ++-- .../cromwell/database/sql/tables/WorkflowStoreEntry.scala | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/database/sql/src/main/scala/cromwell/database/slick/tables/DockerHashStoreEntryComponent.scala b/database/sql/src/main/scala/cromwell/database/slick/tables/DockerHashStoreEntryComponent.scala index e258b40f3b7..5929b2e5a6a 100644 --- a/database/sql/src/main/scala/cromwell/database/slick/tables/DockerHashStoreEntryComponent.scala +++ b/database/sql/src/main/scala/cromwell/database/slick/tables/DockerHashStoreEntryComponent.scala @@ -9,7 +9,7 @@ trait DockerHashStoreEntryComponent { import driver.api._ class DockerHashStoreEntries(tag: Tag) extends Table[DockerHashStoreEntry](tag, "DOCKER_HASH_STORE_ENTRY") { - def dockerHashStoreEntryId = column[Int]("DOCKER_HASH_STORE_ENTRY_ID", O.PrimaryKey, O.AutoInc) + def dockerHashStoreEntryId = column[Long]("DOCKER_HASH_STORE_ENTRY_ID", O.PrimaryKey, O.AutoInc) def workflowExecutionUuid = column[String]("WORKFLOW_EXECUTION_UUID", O.Length(255)) diff --git a/database/sql/src/main/scala/cromwell/database/slick/tables/SubWorkflowStoreEntryComponent.scala b/database/sql/src/main/scala/cromwell/database/slick/tables/SubWorkflowStoreEntryComponent.scala index 2ea7b36782c..11fa2191cb2 100644 --- a/database/sql/src/main/scala/cromwell/database/slick/tables/SubWorkflowStoreEntryComponent.scala +++ b/database/sql/src/main/scala/cromwell/database/slick/tables/SubWorkflowStoreEntryComponent.scala @@ -10,9 +10,9 @@ trait SubWorkflowStoreEntryComponent { import driver.api._ class SubWorkflowStoreEntries(tag: Tag) extends Table[SubWorkflowStoreEntry](tag, "SUB_WORKFLOW_STORE_ENTRY") { - def subWorkflowStoreEntryId = column[Int]("SUB_WORKFLOW_STORE_ENTRY_ID", O.PrimaryKey, O.AutoInc) + def subWorkflowStoreEntryId = column[Long]("SUB_WORKFLOW_STORE_ENTRY_ID", O.PrimaryKey, O.AutoInc) - def rootWorkflowId = column[Int]("ROOT_WORKFLOW_ID") + def rootWorkflowId = column[Long]("ROOT_WORKFLOW_ID") def parentWorkflowExecutionUuid = column[String]("PARENT_WORKFLOW_EXECUTION_UUID", O.Length(255)) @@ -40,7 +40,7 @@ trait SubWorkflowStoreEntryComponent { val subWorkflowStoreEntryIdsAutoInc = subWorkflowStoreEntries returning subWorkflowStoreEntries.map(_.subWorkflowStoreEntryId) val subWorkflowStoreEntriesForRootWorkflowId = Compiled( - (rootWorkflowId: Rep[Int]) => for { + (rootWorkflowId: Rep[Long]) => for { subWorkflowStoreEntry <- subWorkflowStoreEntries if subWorkflowStoreEntry.rootWorkflowId === rootWorkflowId } yield subWorkflowStoreEntry diff --git a/database/sql/src/main/scala/cromwell/database/slick/tables/WorkflowStoreEntryComponent.scala b/database/sql/src/main/scala/cromwell/database/slick/tables/WorkflowStoreEntryComponent.scala index 0e29cee651f..847fa862405 100644 --- a/database/sql/src/main/scala/cromwell/database/slick/tables/WorkflowStoreEntryComponent.scala +++ b/database/sql/src/main/scala/cromwell/database/slick/tables/WorkflowStoreEntryComponent.scala @@ -11,7 +11,7 @@ trait WorkflowStoreEntryComponent { import driver.api._ class WorkflowStoreEntries(tag: Tag) extends Table[WorkflowStoreEntry](tag, "WORKFLOW_STORE_ENTRY") { - def workflowStoreEntryId = column[Int]("WORKFLOW_STORE_ENTRY_ID", O.PrimaryKey, O.AutoInc) + def workflowStoreEntryId = column[Long]("WORKFLOW_STORE_ENTRY_ID", O.PrimaryKey, O.AutoInc) def workflowExecutionUuid = column[String]("WORKFLOW_EXECUTION_UUID", O.Length(255)) diff --git a/database/sql/src/main/scala/cromwell/database/sql/tables/DockerHashStoreEntry.scala b/database/sql/src/main/scala/cromwell/database/sql/tables/DockerHashStoreEntry.scala index a4a5b1247ee..542558324f5 100644 --- a/database/sql/src/main/scala/cromwell/database/sql/tables/DockerHashStoreEntry.scala +++ b/database/sql/src/main/scala/cromwell/database/sql/tables/DockerHashStoreEntry.scala @@ -6,5 +6,5 @@ case class DockerHashStoreEntry dockerTag: String, dockerHash: String, dockerSize: Option[Long], - dockerHashStoreEntryId: Option[Int] = None + dockerHashStoreEntryId: Option[Long] = None ) diff --git a/database/sql/src/main/scala/cromwell/database/sql/tables/SubWorkflowStoreEntry.scala b/database/sql/src/main/scala/cromwell/database/sql/tables/SubWorkflowStoreEntry.scala index 96ac39aa672..4cf89381ad0 100644 --- a/database/sql/src/main/scala/cromwell/database/sql/tables/SubWorkflowStoreEntry.scala +++ b/database/sql/src/main/scala/cromwell/database/sql/tables/SubWorkflowStoreEntry.scala @@ -2,11 +2,11 @@ package cromwell.database.sql.tables case class SubWorkflowStoreEntry ( - rootWorkflowId: Option[Int], + rootWorkflowId: Option[Long], parentWorkflowExecutionUuid: String, callFullyQualifiedName: String, callIndex: Int, callAttempt: Int, subWorkflowExecutionUuid: String, - subWorkflowStoreEntryId: Option[Int] = None + subWorkflowStoreEntryId: Option[Long] = None ) diff --git a/database/sql/src/main/scala/cromwell/database/sql/tables/WorkflowStoreEntry.scala b/database/sql/src/main/scala/cromwell/database/sql/tables/WorkflowStoreEntry.scala index 6c03db87014..efb594444d4 100644 --- a/database/sql/src/main/scala/cromwell/database/sql/tables/WorkflowStoreEntry.scala +++ b/database/sql/src/main/scala/cromwell/database/sql/tables/WorkflowStoreEntry.scala @@ -21,5 +21,5 @@ case class WorkflowStoreEntry cromwellId: Option[String], heartbeatTimestamp: Option[Timestamp], hogGroup: Option[String], - workflowStoreEntryId: Option[Int] = None + workflowStoreEntryId: Option[Long] = None ) From 99f9a5f0bbf5c0f525edaa18dea6aa43a362f3b9 Mon Sep 17 00:00:00 2001 From: Saloni Shah Date: Tue, 13 Sep 2022 12:19:58 -0400 Subject: [PATCH 3/4] [force ci] add onDelete cascade --- .../resources/changesets/enlarge_workflow_store_entry_id.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/database/migration/src/main/resources/changesets/enlarge_workflow_store_entry_id.xml b/database/migration/src/main/resources/changesets/enlarge_workflow_store_entry_id.xml index 00709f5b991..dd58f572854 100644 --- a/database/migration/src/main/resources/changesets/enlarge_workflow_store_entry_id.xml +++ b/database/migration/src/main/resources/changesets/enlarge_workflow_store_entry_id.xml @@ -75,6 +75,7 @@ baseTableName="SUB_WORKFLOW_STORE_ENTRY" referencedTableName="WORKFLOW_STORE_ENTRY" referencedColumnNames="WORKFLOW_STORE_ENTRY_ID" + onDelete="CASCADE" /> From ad27dbe96849d2d106d7672a13f91b33aad30d58 Mon Sep 17 00:00:00 2001 From: Saloni Shah Date: Wed, 14 Sep 2022 17:24:21 -0400 Subject: [PATCH 4/4] add newlines --- .../resources/changesets/enlarge_docker_hash_store_entry_id.xml | 2 +- .../changesets/enlarge_sub_workflow_store_entry_id.xml | 2 +- .../resources/changesets/enlarge_workflow_store_entry_id.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/database/migration/src/main/resources/changesets/enlarge_docker_hash_store_entry_id.xml b/database/migration/src/main/resources/changesets/enlarge_docker_hash_store_entry_id.xml index fdeff0da5db..fc7992268e6 100644 --- a/database/migration/src/main/resources/changesets/enlarge_docker_hash_store_entry_id.xml +++ b/database/migration/src/main/resources/changesets/enlarge_docker_hash_store_entry_id.xml @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/database/migration/src/main/resources/changesets/enlarge_sub_workflow_store_entry_id.xml b/database/migration/src/main/resources/changesets/enlarge_sub_workflow_store_entry_id.xml index 7c62af5131e..57894db824b 100644 --- a/database/migration/src/main/resources/changesets/enlarge_sub_workflow_store_entry_id.xml +++ b/database/migration/src/main/resources/changesets/enlarge_sub_workflow_store_entry_id.xml @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/database/migration/src/main/resources/changesets/enlarge_workflow_store_entry_id.xml b/database/migration/src/main/resources/changesets/enlarge_workflow_store_entry_id.xml index dd58f572854..ea2b498fd51 100644 --- a/database/migration/src/main/resources/changesets/enlarge_workflow_store_entry_id.xml +++ b/database/migration/src/main/resources/changesets/enlarge_workflow_store_entry_id.xml @@ -79,4 +79,4 @@ /> - \ No newline at end of file +