Skip to content

Commit

Permalink
refactor: remove directive errors comparison (#20344)
Browse files Browse the repository at this point in the history
  • Loading branch information
kien6034 committed May 10, 2024
1 parent 946c624 commit 0c91044
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 18 deletions.
3 changes: 2 additions & 1 deletion client/snapshot/load.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"archive/tar"
"bytes"
"compress/gzip"
"errors"
"fmt"
"io"
"os"
Expand Down Expand Up @@ -80,7 +81,7 @@ func LoadArchiveCmd() *cobra.Command {
for i := uint32(0); i < snapshot.Chunks; i++ {
hdr, err = tr.Next()
if err != nil {
if err == io.EOF {
if errors.Is(err, io.EOF) {
break
}
return err
Expand Down
3 changes: 2 additions & 1 deletion orm/encoding/ormfield/string.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package ormfield

import (
"errors"
"fmt"
"io"
"strings"
Expand Down Expand Up @@ -69,7 +70,7 @@ func (s NonTerminalStringCodec) Decode(r Reader) (protoreflect.Value, error) {
var bz []byte
for {
b, err := r.ReadByte()
if b == 0 || err == io.EOF {
if b == 0 || errors.Is(err, io.EOF) {
return protoreflect.ValueOfString(string(bz)), err
}
bz = append(bz, b)
Expand Down
3 changes: 2 additions & 1 deletion orm/encoding/ormkv/index_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package ormkv

import (
"bytes"
"errors"
"io"

"google.golang.org/protobuf/reflect/protoreflect"
Expand Down Expand Up @@ -64,7 +65,7 @@ func NewIndexKeyCodec(prefix []byte, messageType protoreflect.MessageType, index
func (cdc IndexKeyCodec) DecodeIndexKey(k, _ []byte) (indexFields, primaryKey []protoreflect.Value, err error) {
values, err := cdc.DecodeKey(bytes.NewReader(k))
// got prefix key
if err == io.EOF {
if errors.Is(err, io.EOF) {
return values, nil, nil
} else if err != nil {
return nil, nil, err
Expand Down
3 changes: 2 additions & 1 deletion orm/encoding/ormkv/key_codec.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package ormkv

import (
"bytes"
"errors"
"io"

"google.golang.org/protobuf/reflect/protoreflect"
Expand Down Expand Up @@ -122,7 +123,7 @@ func (cdc *KeyCodec) DecodeKey(r *bytes.Reader) ([]protoreflect.Value, error) {
values := make([]protoreflect.Value, 0, n)
for i := 0; i < n; i++ {
value, err := cdc.fieldCodecs[i].Decode(r)
if err == io.EOF {
if errors.Is(err, io.EOF) {
return values, err
} else if err != nil {
return nil, err
Expand Down
5 changes: 3 additions & 2 deletions orm/encoding/ormkv/primary_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package ormkv

import (
"bytes"
"errors"
"io"

"google.golang.org/protobuf/proto"
Expand Down Expand Up @@ -38,7 +39,7 @@ func (p PrimaryKeyCodec) DecodeIndexKey(k, _ []byte) (indexFields, primaryKey []
indexFields, err = p.DecodeKey(bytes.NewReader(k))

// got prefix key
if err == io.EOF {
if errors.Is(err, io.EOF) {
return indexFields, nil, nil
} else if err != nil {
return nil, nil, err
Expand All @@ -54,7 +55,7 @@ func (p PrimaryKeyCodec) DecodeIndexKey(k, _ []byte) (indexFields, primaryKey []

func (p PrimaryKeyCodec) DecodeEntry(k, v []byte) (Entry, error) {
values, err := p.DecodeKey(bytes.NewReader(k))
if err == io.EOF {
if errors.Is(err, io.EOF) {
return &PrimaryKeyEntry{
TableName: p.messageType.Descriptor().FullName(),
Key: values,
Expand Down
3 changes: 2 additions & 1 deletion orm/encoding/ormkv/unique_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package ormkv

import (
"bytes"
"errors"
"io"

"google.golang.org/protobuf/reflect/protoreflect"
Expand Down Expand Up @@ -87,7 +88,7 @@ func (u UniqueKeyCodec) DecodeIndexKey(k, v []byte) (indexFields, primaryKey []p
ks, err := u.keyCodec.DecodeKey(bytes.NewReader(k))

// got prefix key
if err == io.EOF {
if errors.Is(err, io.EOF) {
return ks, nil, err
} else if err != nil {
return nil, nil, err
Expand Down
3 changes: 2 additions & 1 deletion server/grpc/gogoreflection/serverreflection.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ package gogoreflection
import (
"bytes"
"compress/gzip"
"errors"
"fmt"
"io"
"log"
Expand Down Expand Up @@ -375,7 +376,7 @@ func (s *serverReflectionServer) ServerReflectionInfo(stream rpb.ServerReflectio
sentFileDescriptors := make(map[string]bool)
for {
in, err := stream.Recv()
if err == io.EOF {
if errors.Is(err, io.EOF) {
return nil
}
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions store/rootmulti/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ func (rs *Store) Snapshot(height uint64, protoWriter protoio.Writer) error {
nodeCount := 0
for {
node, err := exporter.Next()
if err == iavltree.ErrorExportDone {
if errors.Is(err, iavltree.ErrorExportDone) {
rs.logger.Debug("snapshot Done", "store", store.name, "nodeCount", nodeCount)
break
} else if err != nil {
Expand Down Expand Up @@ -920,7 +920,7 @@ loop:
for {
snapshotItem = snapshottypes.SnapshotItem{}
err := protoReader.ReadMsg(&snapshotItem)
if err == io.EOF {
if errors.Is(err, io.EOF) {
break
} else if err != nil {
return snapshottypes.SnapshotItem{}, errorsmod.Wrap(err, "invalid protobuf message")
Expand Down
2 changes: 1 addition & 1 deletion store/snapshots/chunk.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func (r *ChunkReader) Read(p []byte) (int, error) {
}
}
n, err := r.reader.Read(p)
if err == io.EOF {
if errors.IsOf(err, io.EOF) {
err = r.reader.Close()
r.reader = nil
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions store/snapshots/helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func (m *mockSnapshotter) Restore(
for {
item.Reset()
err := protoReader.ReadMsg(&item)
if err == io.EOF {
if errors.Is(err, io.EOF) {
break
} else if err != nil {
return snapshottypes.SnapshotItem{}, errorsmod.Wrap(err, "invalid protobuf message")
Expand Down Expand Up @@ -312,7 +312,7 @@ func (s *extSnapshotter) SnapshotExtension(height uint64, payloadWriter snapshot
func (s *extSnapshotter) RestoreExtension(height uint64, format uint32, payloadReader snapshottypes.ExtensionPayloadReader) error {
for {
payload, err := payloadReader()
if err == io.EOF {
if errors.Is(err, io.EOF) {
break
} else if err != nil {
return err
Expand Down
3 changes: 2 additions & 1 deletion store/v2/snapshots/chunk.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package snapshots

import (
stderrors "errors"
"io"
"math"

Expand Down Expand Up @@ -149,7 +150,7 @@ func (r *ChunkReader) Read(p []byte) (int, error) {
}
}
n, err := r.reader.Read(p)
if err == io.EOF {
if stderrors.Is(err, io.EOF) {
err = r.reader.Close()
r.reader = nil
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions store/v2/snapshots/helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func (m *mockCommitSnapshotter) Restore(
for {
item.Reset()
err := protoReader.ReadMsg(&item)
if err == io.EOF {
if errors.Is(err, io.EOF) {
break
} else if err != nil {
return snapshotstypes.SnapshotItem{}, errorsmod.Wrap(err, "invalid protobuf message")
Expand Down Expand Up @@ -277,7 +277,7 @@ func (s *extSnapshotter) SnapshotExtension(height uint64, payloadWriter snapshot
func (s *extSnapshotter) RestoreExtension(height uint64, format uint32, payloadReader snapshots.ExtensionPayloadReader) error {
for {
payload, err := payloadReader()
if err == io.EOF {
if errors.Is(err, io.EOF) {
break
} else if err != nil {
return err
Expand Down
5 changes: 3 additions & 2 deletions tools/hubl/internal/compat.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package internal

import (
"context"
"errors"
"fmt"
"io"
"strings"
Expand Down Expand Up @@ -47,7 +48,7 @@ func loadFileDescriptorsGRPCReflection(ctx context.Context, client *grpc.ClientC
go func() {
for {
in, err := reflectClient.Recv()
if err == io.EOF {
if errors.Is(err, io.EOF) {
// read done.
close(waitc)
return
Expand Down Expand Up @@ -172,7 +173,7 @@ func addMissingFileDescriptors(ctx context.Context, client *grpc.ClientConn, fdM
go func() {
for {
in, err := reflectClient.Recv()
if err == io.EOF {
if errors.Is(err, io.EOF) {
// read done.
close(waitc)
return
Expand Down

0 comments on commit 0c91044

Please sign in to comment.