Remove dead code and unnecessary lock from reflect codec #2560
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
StephenButtolph
commented
Dec 29, 2023
Comment on lines
-71
to
-73
| if s.serializedFieldIndices == nil { | ||
| s.serializedFieldIndices = make(map[reflect.Type][]FieldDesc) | ||
| } |
Comment on lines
+114
to
+120
| func (s *structFielder) getCachedSerializedFields(t reflect.Type) ([]FieldDesc, bool) { | ||
| s.lock.RLock() | ||
| defer s.lock.RUnlock() | ||
|
|
||
| cachedFields, ok := s.serializedFieldIndices[t] | ||
| return cachedFields, ok | ||
| } |
There was a problem hiding this comment.
I waffled back and forth on if this should be it's own function... but ended up making it it's own function so that we could defer the RUnlock
| @@ -65,15 +65,13 @@ type structFielder struct { | |||
| } | |||
|
|
|||
| func (s *structFielder) GetSerializedFields(t reflect.Type) ([]FieldDesc, error) { | |||
| if serializedFields, ok := s.getCachedSerializedFields(t); ok { // use pre-computed result | |||
| return serializedFields, nil | |||
There was a problem hiding this comment.
We expect this to always happen once the node has marshalled / unmarshalled all of the struct types that are registered by the node.
danlaine
approved these changes
Dec 29, 2023
dhrubabasu
approved these changes
Dec 29, 2023
pull bot
pushed a commit
to AKAJOKER2/avalanchego
that referenced
this pull request
Jan 1, 2024
…a-labs#2560) Co-authored-by: Alberto Benegiamo <alberto.benegiamo@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.
Why this should be merged
serializedFieldIndicesis initialized during struct creation, so thenilcheck is dead code.serializedFieldIndicesis expected to only be modified around node startup. This means that we expect the vast majority of the time for the fields to be cached. This avoids grabbing a write lock when looking up the cached fields.How this works
How this was tested