Skip to content

CORE-707: add index for WORKSPACE_SETTINGS table #3502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft

CORE-707: add index for WORKSPACE_SETTINGS table #3502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
237a422
add index for WORKSPACE_SETTINGS table
davidangb Oct 15, 2025
59dc3c3
Merge branch 'develop' into da_CORE-707_workspaceSettingsIndex
davidangb Oct 16, 2025
be4ba49
Merge branch 'develop' into da_CORE-707_workspaceSettingsIndex
davidangb Oct 17, 2025
9797fc4
scalafmt
davidangb Oct 17, 2025
5b9a5c8
Merge branch 'develop' into da_CORE-707_workspaceSettingsIndex
davidangb Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/src/main/resources/org/broadinstitute/dsde/rawls/liquibase/changelog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,5 +149,6 @@
<include file="changesets/20250821_remove_all_gcpbatch_workspace_settings_again.xml" relativeToChangelogFile="true"/>
<include file="changesets/20250912_workflow_actual_cost.xml" relativeToChangelogFile="true"/>
<include file="changesets/20251009_quicksilver_for_empty_workspaces.xml" relativeToChangelogFile="true"/>
<include file="changesets/20251015_workspace_settings_index.xml" relativeToChangelogFile="true"/>
<include file="changesets/20251015_entity_indexing.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>
12 changes: 12 additions & 0 deletions .../org/broadinstitute/dsde/rawls/liquibase/changesets/20251015_workspace_settings_index.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<databaseChangeLog logicalFilePath="dummy" 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-4.33.xsd">
<changeSet logicalFilePath="dummy" author="davidan" id="workspace_settings_index">
<createIndex tableName="WORKSPACE_SETTINGS" indexName="idx_ws_type_status">
<column name="WORKSPACE_ID" />
<column name="SETTING_TYPE" />
<column name="STATUS" />
</createIndex>
</changeSet>
</databaseChangeLog>
10 changes: 5 additions & 5 deletions core/src/main/scala/org/broadinstitute/dsde/rawls/webservice/SubmissionApiService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ trait SubmissionApiService extends UserInfoDirectives {
get {
parameters("startDate".as[DateTime].?, "endDate".as[DateTime].?) { (startDateOpt, endDateOpt) =>
complete {
submissionsServiceConstructor(ctx).listSubmissions(
WorkspaceName(workspaceNamespace, workspaceName),
ctx,
startDateOpt,
endDateOpt)
submissionsServiceConstructor(ctx).listSubmissions(WorkspaceName(workspaceNamespace, workspaceName),
ctx,
startDateOpt,
endDateOpt
)
Copy link
Contributor Author

@davidangb davidangb Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

scalafmt; not sure why it complained in this PR.

}
}
}
Expand Down
10 changes: 8 additions & 2 deletions core/src/test/scala/org/broadinstitute/dsde/rawls/jobexec/SubmissionSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,10 @@ class SubmissionSpec(_system: ActorSystem)
val submissionData = checkSubmissionStatus(submissionsService, newSubmissionReport.submissionId)
assert(submissionData.workflows.size == 1)

val subList = Await.result(submissionsService.listSubmissions(testData.wsName, testContext, Option.empty, Option.empty), Duration.Inf)
val subList =
Await.result(submissionsService.listSubmissions(testData.wsName, testContext, Option.empty, Option.empty),
Duration.Inf
)
Copy link
Contributor Author

@davidangb davidangb Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

scalafmt; not sure why it complained in this PR.


val oneSub = subList.filter(s => s.submissionId == newSubmissionReport.submissionId)
assert(oneSub.nonEmpty)
Expand Down Expand Up @@ -1289,7 +1292,10 @@ class SubmissionSpec(_system: ActorSystem)
val submissionData = checkSubmissionStatus(submissionsService, newSubmissionReport.submissionId)
assert(submissionData.workflows.size == 1)

val subList = Await.result(submissionsService.listSubmissions(testData.wsName, testContext, Option.empty, Option.empty), Duration.Inf)
val subList =
Await.result(submissionsService.listSubmissions(testData.wsName, testContext, Option.empty, Option.empty),
Duration.Inf
)

val oneSub = subList.filter(s => s.submissionId == newSubmissionReport.submissionId)
assert(oneSub.nonEmpty)
Expand Down
Loading