Let ProgramStorage::external be async #1291
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
coolreader18
force-pushed
the
noa/async-program-storage
branch
5 times, most recently
from
1ee3fbf to
e307d29
Compare
coolreader18
force-pushed
the
noa/async-program-storage
branch
from
e307d29 to
6f6c1f4
Compare
kim
approved these changes
May 24, 2024
crates/core/src/host/disk_storage.rs
Outdated
|
|
||
| fs::rename(tmp, path).await?; | ||
| } | ||
| Err(e) if e.kind() == io::ErrorKind::AlreadyExists => { |
There was a problem hiding this comment.
Yeah, it was causing errors in CI - all the tests upload the same module simultaneously, I think.
| @@ -46,37 +48,57 @@ type HostCell = Arc<AsyncRwLock<Option<Host>>>; | |||
| /// The registry of all running hosts. | |||
| type Hosts = Arc<Mutex<IntMap<u64, HostCell>>>; | |||
|
|
|||
| type ExternalStorage = dyn Fn(&Hash) -> anyhow::Result<Option<AnyBytes>> + Send + Sync + 'static; | |||
| type SameDbStorage = dyn Fn(&RelationalDB, &Hash) -> anyhow::Result<Option<AnyBytes>> + Send + Sync + 'static; | |||
| #[async_trait] | |||
There was a problem hiding this comment.
Yes - it lets the future borrow from the ExternalStorage, rather than having to be 'static
| debug!("lookup program {}", program_hash); | ||
| match self { | ||
| ProgramStorage::External(external) => external.lookup(program_hash).await, | ||
| ProgramStorage::SameDb(f) => f(db, program_hash), |
There was a problem hiding this comment.
Wondering if this should be spawn blocking, just in case the same thread has a tx open…
There was a problem hiding this comment.
Hmm, probably - but we can cross that when we get to actually using it.
| @@ -89,7 +111,7 @@ pub struct HostController { | |||
| /// The directory to create database instances in. | |||
| /// | |||
| /// For example: | |||
| /// | |||
| ///> | |||
There was a problem hiding this comment.
oops, nothing
| @@ -1,34 +0,0 @@ | |||
| use crate::{ | |||
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.
Description of Changes
Also: remove sled object_db. Merging that in from #1245.
Expected complexity level and risk
1