Skip to content

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 1 commit into from
Dec 29, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions codec/reflectcodec/struct_fielder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Copy link
Contributor Author

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.

}

s.lock.Lock()
defer s.lock.Unlock()

if s.serializedFieldIndices == nil {
s.serializedFieldIndices = make(map[reflect.Type][]FieldDesc)
}
Comment on lines -71 to -73
Copy link
Contributor Author

Choose a reason for hiding this comment

The 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
Expand All @@ -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
Expand Down Expand Up @@ -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
Copy link
Contributor Author

Choose a reason for hiding this comment

The 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 RUnlock