Trampoline chained DBIOActions #1703
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
|
@szeiger I recommend reading the diff ignoring whitespace like this: https://github.com/slick/slick/pull/1703/files?w=1 |
|
I made an update to this PR to only trampoline when recursion gets high. That should remove any worries about performance. |
derekjw
force-pushed
the
stack-safe-actions
branch
2 times, most recently
from
e1e33bd
to
7ae5f53
Compare
|
@szeiger Did you have time to check this? |
|
@derekjw can you rebase this on current master |
|
@hvesalai sure can, I should be able to get that done this evening |
derekjw
force-pushed
the
stack-safe-actions
branch
from
7ae5f53
to
70dfd2f
Compare
|
@hvesalai Rebased onto current master, travis build failed though (I ran tests multiple times locally and can't get a failure). Looks like travis is giving it another try now |
|
Yes, I'm seeing that problem sporadically. Not related to your PR |
|
LGTM |
|
@hvesalai thanks! |
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.
Fix for #1700
Previous fix #1701 did not work in the case of other actions being interwoven with the flatMap actions. A more general solution uses a trampoline for calls to runInContext, using DBIO.sameThreadExecutionContext.