chore: linting (#15814)

This commit is contained in:
Marko
2023-04-12 13:21:47 +00:00
committed by GitHub
parent 37032fb948
commit 1641bb9f0d
10 changed files with 51 additions and 51 deletions
+13 -13
View File
@@ -24,10 +24,10 @@ type tableImpl struct {
indexes []Index
indexesByFields map[fieldnames.FieldNames]concreteIndex
uniqueIndexesByFields map[fieldnames.FieldNames]UniqueIndex
indexesById map[uint32]Index
entryCodecsById map[uint32]ormkv.EntryCodec
indexesByID map[uint32]Index
entryCodecsByID map[uint32]ormkv.EntryCodec
tablePrefix []byte
tableId uint32
tableID uint32
typeResolver TypeResolver
customJSONValidator func(message proto.Message) error
}
@@ -44,7 +44,7 @@ func (t tableImpl) PrimaryKey() UniqueIndex {
}
func (t tableImpl) GetIndexByID(id uint32) Index {
return t.indexesById[id]
return t.indexesByID[id]
}
func (t tableImpl) Save(ctx context.Context, message proto.Message) error {
@@ -187,16 +187,16 @@ func (t tableImpl) DefaultJSON() json.RawMessage {
return json.RawMessage("[]")
}
func (t tableImpl) decodeJson(reader io.Reader, onMsg func(message proto.Message) error) error {
decoder, err := t.startDecodeJson(reader)
func (t tableImpl) decodeJSON(reader io.Reader, onMsg func(message proto.Message) error) error {
decoder, err := t.startDecodeJSON(reader)
if err != nil {
return err
}
return t.doDecodeJson(decoder, nil, onMsg)
return t.doDecodeJSON(decoder, nil, onMsg)
}
func (t tableImpl) startDecodeJson(reader io.Reader) (*json.Decoder, error) {
func (t tableImpl) startDecodeJSON(reader io.Reader) (*json.Decoder, error) {
decoder := json.NewDecoder(reader)
token, err := decoder.Token()
if err != nil {
@@ -213,7 +213,7 @@ func (t tableImpl) startDecodeJson(reader io.Reader) (*json.Decoder, error) {
// onFirst is called on the first RawMessage and used for auto-increment tables
// to decode the sequence in which case it should return true.
// onMsg is called on every decoded message
func (t tableImpl) doDecodeJson(decoder *json.Decoder, onFirst func(message json.RawMessage) bool, onMsg func(message proto.Message) error) error {
func (t tableImpl) doDecodeJSON(decoder *json.Decoder, onFirst func(message json.RawMessage) bool, onMsg func(message proto.Message) error) error {
unmarshalOptions := protojson.UnmarshalOptions{Resolver: t.typeResolver}
first := true
@@ -280,7 +280,7 @@ func DefaultJSONValidator(message proto.Message) error {
}
func (t tableImpl) ValidateJSON(reader io.Reader) error {
return t.decodeJson(reader, func(message proto.Message) error {
return t.decodeJSON(reader, func(message proto.Message) error {
if t.customJSONValidator != nil {
return t.customJSONValidator(message)
}
@@ -295,7 +295,7 @@ func (t tableImpl) ImportJSON(ctx context.Context, reader io.Reader) error {
return err
}
return t.decodeJson(reader, func(message proto.Message) error {
return t.decodeJSON(reader, func(message proto.Message) error {
return t.save(ctx, backend, message, saveModeDefault)
})
}
@@ -366,7 +366,7 @@ func (t tableImpl) DecodeEntry(k, v []byte) (ormkv.Entry, error) {
return nil, ormerrors.UnexpectedDecodePrefix.Wrapf("uint32 varint id out of range %d", id)
}
idx, ok := t.entryCodecsById[uint32(id)]
idx, ok := t.entryCodecsByID[uint32(id)]
if !ok {
return nil, ormerrors.UnexpectedDecodePrefix.Wrapf("can't find field with id %d", id)
}
@@ -391,7 +391,7 @@ func (t tableImpl) EncodeEntry(entry ormkv.Entry) (k, v []byte, err error) {
}
func (t tableImpl) ID() uint32 {
return t.tableId
return t.tableID
}
func (t tableImpl) Has(ctx context.Context, message proto.Message) (found bool, err error) {