-
Notifications
You must be signed in to change notification settings - Fork 779
Remove dead code and unnecessary lock from reflect codec #2560
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -48,7 +48,7 @@ func NewStructFielder(tagNames []string, maxSliceLen uint32) StructFielder { | |
} | ||
|
||
type structFielder struct { | ||
lock sync.Mutex | ||
lock sync.RWMutex | ||
|
||
// multiple tags per field can be specified. A field is serialized/deserialized | ||
// if it has at least one of the specified tags. | ||
|
@@ -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 | ||
} | ||
|
||
s.lock.Lock() | ||
defer s.lock.Unlock() | ||
|
||
if s.serializedFieldIndices == nil { | ||
s.serializedFieldIndices = make(map[reflect.Type][]FieldDesc) | ||
} | ||
Comment on lines
-71
to
-73
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 💀 |
||
if serializedFields, ok := s.serializedFieldIndices[t]; ok { // use pre-computed result | ||
return serializedFields, nil | ||
} | ||
numFields := t.NumField() | ||
serializedFields := make([]FieldDesc, 0, numFields) | ||
for i := 0; i < numFields; i++ { // Go through all fields of this struct | ||
|
@@ -82,9 +80,7 @@ func (s *structFielder) GetSerializedFields(t reflect.Type) ([]FieldDesc, error) | |
// Multiple tags per fields can be specified. | ||
// Serialize/Deserialize field if it has | ||
// any tag with the right value | ||
var ( | ||
captureField bool | ||
) | ||
var captureField bool | ||
for _, tag := range s.tags { | ||
if field.Tag.Get(tag) == TagValue { | ||
captureField = true | ||
|
@@ -114,3 +110,11 @@ func (s *structFielder) GetSerializedFields(t reflect.Type) ([]FieldDesc, error) | |
s.serializedFieldIndices[t] = serializedFields // cache result | ||
return serializedFields, nil | ||
} | ||
|
||
func (s *structFielder) getCachedSerializedFields(t reflect.Type) ([]FieldDesc, bool) { | ||
s.lock.RLock() | ||
defer s.lock.RUnlock() | ||
|
||
cachedFields, ok := s.serializedFieldIndices[t] | ||
return cachedFields, ok | ||
} | ||
Comment on lines
+114
to
+120
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 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 |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We expect this to always happen once the node has marshalled / unmarshalled all of the struct types that are registered by the node.