Fixed a small bug in the Report function #530
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
pratikspatil024
force-pushed
the
block-stm-fix-bug
branch
from
1f7ae0e
to
f97de3a
Compare
cffls
reviewed
Sep 26, 2022
core/blockstm/dag.go
Outdated
| @@ -80,7 +100,7 @@ func (d DAG) Report(out func(string)) { | |||
| rootIds = append(rootIds, k) | |||
| } | |||
|
|
|||
| sort.Ints(roots) | |||
| roots, rootIds = bubbleSort(roots, rootIds) | |||
There was a problem hiding this comment.
Not sure if this is the best way to sort this. Can we create a map (roots -> rootIds), sort roots, and re-create a sorted rootId slace based on the sorted roots and the map?
There was a problem hiding this comment.
Yes sure, will do this.
pratikspatil024
force-pushed
the
block-stm-fix-bug
branch
2 times, most recently
from
284f93f
to
530e723
Compare
cffls
approved these changes
Sep 27, 2022
core/blockstm/dag.go
Outdated
| @@ -74,13 +74,19 @@ func BuildDAG(deps TxnInputOutput) (d DAG) { | |||
| func (d DAG) Report(out func(string)) { | |||
| roots := make([]int, 0) | |||
| rootIds := make([]string, 0) | |||
| rootIdMap := make(map[int]string, 0) | |||
There was a problem hiding this comment.
Maybe consider preallocating the map with the size of len(d.GetRoots())?
pratikspatil024
force-pushed
the
block-stm-fix-bug
branch
from
530e723
to
61fa555
Compare
cffls
pushed a commit
that referenced
this pull request
Sep 29, 2022
pratikspatil024
added a commit
that referenced
this pull request
Oct 7, 2022
* Create MVHashMap and use it StateDB * Parallel state processor * Move fee burning and tipping out of state transition to reduce read/write dependencies between transactions * Re-execute parallel tasks when there is a read in coinbase or burn address * Block-stm optimization Added tests for executor and two major improvements: 1. Add a dependency map during execution. This will prevent aborted tasks from being sent for execution immedaitely after failure. 2. Change the key of MVHashMap from string to a byte array. This will reduce time to convert byte slices to strings. * Remove cache from executor test * added mvhashmap unit tests (with as key) * Shard mvhashmap to reduce the time spent in global mutex * Skip applying intermediate states * Dependency improvement * added test for status * Create MVHashMap and use it StateDB * Parallel state processor * Move fee burning and tipping out of state transition to reduce read/write dependencies between transactions * Re-execute parallel tasks when there is a read in coinbase or burn address * Txn prioritizer implemented using mutex map (#487) * basic txn prioritizer implemented using mutex map * Re-execute parallel tasks when there is a read in coinbase or burn address * Re-execute parallel tasks when there is a read in coinbase or burn address * using *sync.RWMutex{} in mutexMap Co-authored-by: Jerry <jerrycgh@gmail.com> * added getReadMap and getWriteMap (#473) * Block-stm optimization Added tests for executor and some improvements: 1. Add a dependency map during execution. This will prevent aborted tasks from being sent for execution immedaitely after failure. 2. Change the key of MVHashMap from string to a byte array. This will reduce time to convert byte slices to strings. 3. Use sync.Map to reduce the time spent in global mutex. 4. Skip applying intermediate states. 5. Estimate dependency when an execution fails without dependency information. 6. Divide execution task queue into two separate queues. One for relatively certain transactions, and the other for speculative future transactions. 7. Setting dependencies of Txs coming from the same sender before starting parallel execution. 8. Process results in their semantic order (transaction index) instead of the order when they arrive. Replace result channel with a priority queue. * Do not write entire objects directly when applying write set in blockstm * fixed a small bug in the Report function (#530) * linters Co-authored-by: Jerry <jerrycgh@gmail.com>
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.
We only used to sort the roots, we should also modify the rootIds in the same order.