0
0

field cache also tracks fieldIndex -> fieldName reverse mapping

This commit is contained in:
Steve Yen 2016-09-29 15:31:29 -07:00
parent ca4384e9b5
commit 004e157963

View File

@ -15,6 +15,7 @@ import (
type FieldCache struct { type FieldCache struct {
fieldIndexes map[string]uint16 fieldIndexes map[string]uint16
indexFields []string
lastFieldIndex int lastFieldIndex int
mutex sync.RWMutex mutex sync.RWMutex
} }
@ -28,11 +29,22 @@ func NewFieldCache() *FieldCache {
func (f *FieldCache) AddExisting(field string, index uint16) { func (f *FieldCache) AddExisting(field string, index uint16) {
f.mutex.Lock() f.mutex.Lock()
defer f.mutex.Unlock() f.addLOCKED(field, index)
f.mutex.Unlock()
}
func (f *FieldCache) addLOCKED(field string, index uint16) uint16 {
f.fieldIndexes[field] = index f.fieldIndexes[field] = index
if len(f.indexFields) < int(index)+1 {
prevIndexFields := f.indexFields
f.indexFields = make([]string, int(index)+16)
copy(f.indexFields, prevIndexFields)
}
f.indexFields[int(index)] = field
if int(index) > f.lastFieldIndex { if int(index) > f.lastFieldIndex {
f.lastFieldIndex = int(index) f.lastFieldIndex = int(index)
} }
return index
} }
// FieldNamed returns the index of the field, and whether or not it existed // FieldNamed returns the index of the field, and whether or not it existed
@ -56,20 +68,16 @@ func (f *FieldCache) FieldNamed(field string, createIfMissing bool) (uint16, boo
return index, true return index, true
} }
// assign next field id // assign next field id
index := uint16(f.lastFieldIndex + 1) index := f.addLOCKED(field, uint16(f.lastFieldIndex + 1))
f.fieldIndexes[field] = index
f.lastFieldIndex = int(index)
f.mutex.Unlock() f.mutex.Unlock()
return index, false return index, false
} }
func (f *FieldCache) FieldIndexed(index uint16) string { func (f *FieldCache) FieldIndexed(index uint16) (field string) {
f.mutex.RLock() f.mutex.RLock()
defer f.mutex.RUnlock() if int(index) < len(f.indexFields) {
for fieldName, fieldIndex := range f.fieldIndexes { field = f.indexFields[int(index)]
if index == fieldIndex {
return fieldName
}
} }
return "" f.mutex.RUnlock()
return field
} }