CORE-362: new DataSource.inTransaction signatures #3260
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
davidangb
commented
Apr 4, 2025
| @@ -170,7 +170,7 @@ class BucketMigrationServiceImpl(val dataSource: SlickDataSource, val samDAO: Sa | |||
| // get migration progress if it exists | |||
| workspacesWithProgressOpt <- workspaces.traverse { workspace => | |||
| dataSource | |||
| .inTransaction(getBucketMigrationProgress(workspace)) | |||
| .inTransaction(dataAccess => getBucketMigrationProgress(workspace)(dataAccess)) | |||
There was a problem hiding this comment.
the previously-working function currying here needs to be explicit with the new inTransaction signatures.
…institute/rawls into da_CORE-362_inTransactionSignature
davidangb
commented
Apr 4, 2025
| @@ -69,7 +70,7 @@ class CoordinatedDataSourceActorSpec | |||
| val mockSlickDataSource = mock[SlickDataSource](RETURNS_SMART_NULLS) | |||
| val mockDataAccessFunction = mock[DataAccess => ReadWriteAction[Any]](RETURNS_SMART_NULLS) | |||
| val transactionIsolation = TransactionIsolation.RepeatableRead | |||
| when(mockSlickDataSource.inTransaction(mockDataAccessFunction, transactionIsolation)) | |||
| when(mockSlickDataSource.inTransaction(argeq(mockDataAccessFunction), argeq(transactionIsolation), any())) | |||
There was a problem hiding this comment.
new signatures need updated mocks
davidangb
requested review from
dvoet and
kevinmarete
and removed request for
a team
davidangb
commented
Apr 5, 2025
| def batchUpdateEntities(entityUpdates: Seq[EntityUpdateDefinition], parentContext: RawlsRequestContext): Future[Traversable[Entity]] | ||
| def batchUpdateEntities(entityUpdates: Seq[EntityUpdateDefinition], | ||
| parentContext: RawlsRequestContext | ||
| ): Future[Traversable[Entity]] |
There was a problem hiding this comment.
not sure why this PR has so much reformatting; this happened after rebasing #3249 into here.
dvoet
approved these changes
Apr 7, 2025
| * @tparam T type returned by the query | ||
| * @return query results | ||
| */ | ||
| // the `null` default for concurrency is ugly. However, it is the value specified by |
There was a problem hiding this comment.
you could wrap it in an Option
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ticket: CORE-362
Some prefactoring for the main changes in CORE-362.
This PR adds new, hopefully more readable, signatures for the
DataSource.inTransactionmethod. This includes a new ability to specify the result set concurrency:ReadOnlyvs.Updatable. See https://dev.mysql.com/doc/refman/8.4/en/innodb-performance-ro-txn.html for more info on theReadOnlyhint.See
EntityStatisticsCacheMonitorandLocalEntityProviderfor example changes of how these new signatures look. The TL;DR is it changes the code fromdataSource.inTransaction{ … many lines of code … }, ReadCommittedto
dataSource.inTransaction(ReadCommitted){ … many lines of code … }