This repository has been archived by the owner on Feb 1, 2024. It is now read-only.
Implement and integrate Rust block store #1885
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
83d20c7 to
51c0225
Compare
added 7 commits
October 1, 2018 09:47
This is required to debug certain FFI and threading issues and should be one by default to save time. Signed-off-by: Adam Ludvik <ludvik@bitwise.io>
Move this code to the Python FFI module and make it more general purpose. Signed-off-by: Adam Ludvik <ludvik@bitwise.io>
Rewrite the Python blockstore in Rust. Signed-off-by: Adam Ludvik <ludvik@bitwise.io>
Replace the Python blockstore with the Rust blockstoer. Signed-off-by: Adam Ludvik <ludvik@bitwise.io>
These are not used. Signed-off-by: Adam Ludvik <ludvik@bitwise.io>
The FFI layer was no longer required and the ChainController can access the CommiStore directly now. Signed-off-by: Adam Ludvik <ludvik@bitwise.io>
The Rust blockstore only exposes those FFI methods required by client handlers, and these methods are already covered by the client request handlers. Signed-off-by: Adam Ludvik <ludvik@bitwise.io>
51c0225 to
677f17b
Compare
677f17b to
4ade52d
Compare
DictDatabase no long works with BlockStore, so we need to replace its usage. Signed-off-by: Adam Ludvik <ludvik@bitwise.io>
4ade52d to
aa4e3ea
Compare
boydjohnson
approved these changes
Oct 2, 2018
peterschwarz
reviewed
Oct 2, 2018
| let gil = Python::acquire_gil(); | ||
| let py = gil.python(); | ||
| let py_block_store = PyBlockStore::new(PyObject::from_borrowed_ptr(py, block_store)); | ||
| let commit_store = Box::from_raw(commit_store as *mut CommitStore); |
There was a problem hiding this comment.
Why do you use from_raw/into_raw here? Why don't you just use the pointer?
There was a problem hiding this comment.
I don’t have a good reason for not just using the pointer. I thought I needed to do from_raw/into_raw to get the clone to work right, but I was confused.
There was a problem hiding this comment.
There are lot's of examples of this in chain_ffi.rs , including a call to clone
There was a problem hiding this comment.
The thing that threw me off is the type expected by add_store() is Box<BlockStore>, not CommitStore, so you can't do (*(commit_store as *mut CommitStore)).
There was a problem hiding this comment.
I am changing my mind again. Trying to do (*(commit_store as *mut Box<CommitStore>)) is bad, causes a seg fault, so I think I do need the from_raw/into_raw.
peterschwarz
approved these changes
Oct 2, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Replaces the Python implementation of the blockstore with a pure Rust implementation, dubbed the CommitStore to be consistent with the naming scheme used by the BlockManager API.