Skip to content

Commit 26f06dd

Browse files
SimFGSimFG
authored
Format the code (milvus-io#27275)
Signed-off-by: SimFG <[email protected]>
1 parent fe01d54 commit 26f06dd

File tree

652 files changed

+3342
-2992
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

652 files changed

+3342
-2992
lines changed

Diff for: ‎.golangci.yml

+24-10
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,43 @@ run:
77
- docs
88
- scripts
99
- internal/core
10+
- cmake_build
1011

1112
linters:
1213
disable-all: true
1314
enable:
14-
- staticcheck
15-
- typecheck
16-
- goimports
17-
- misspell
15+
- gosimple
1816
- govet
1917
- ineffassign
20-
- gosimple
18+
- staticcheck
19+
- decorder
20+
- depguard
21+
- gofmt
22+
- goimports
2123
- gosec
2224
- revive
23-
- durationcheck
2425
- unconvert
26+
- misspell
27+
- typecheck
28+
- durationcheck
2529
- forbidigo
26-
- depguard
30+
- gci
31+
- whitespace
32+
- gofumpt
2733
# - gocritic
2834

2935
linters-settings:
36+
gci:
37+
sections:
38+
- standard
39+
- default
40+
- prefix(github.com/milvus-io)
41+
custom-order: true
42+
gofumpt:
43+
lang-version: "1.18"
44+
module-path: github.com/milvus-io
45+
goimports:
46+
local-prefixes: github.com/milvus-io
3047
revive:
3148
rules:
3249
- name: unused-parameter
@@ -92,6 +109,3 @@ issues:
92109
max-issues-per-linter: 0
93110
# Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
94111
max-same-issues: 0
95-
96-
service:
97-
golangci-lint-version: 1.27.0 # use the fixed version to not introduce new linters unexpectedly

Diff for: ‎Makefile

+30-8
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@ INSTALL_GOLANGCI_LINT := $(findstring $(GOLANGCI_LINT_VERSION), $(GOLANGCI_LINT_
3636
MOCKERY_VERSION := 2.32.4
3737
MOCKERY_OUTPUT := $(shell $(INSTALL_PATH)/mockery --version 2>/dev/null)
3838
INSTALL_MOCKERY := $(findstring $(MOCKERY_VERSION),$(MOCKERY_OUTPUT))
39+
# gci
40+
GCI_VERSION := 0.11.2
41+
GCI_OUTPUT := $(shell $(INSTALL_PATH)/gci --version 2>/dev/null)
42+
INSTALL_GCI := $(findstring $(GCI_VERSION),$(GCI_OUTPUT))
43+
# gofumpt
44+
GOFUMPT_VERSION := 0.5.0
45+
GOFUMPT_OUTPUT := $(shell $(INSTALL_PATH)/gofumpt --version 2>/dev/null)
46+
INSTALL_GOFUMPT := $(findstring $(GOFUMPT_VERSION),$(GOFUMPT_OUTPUT))
3947

4048
export GIT_BRANCH=master
4149

@@ -97,18 +105,32 @@ else
97105
@GO111MODULE=on env bash $(PWD)/scripts/gofmt.sh pkg/
98106
endif
99107

100-
lint: tools/bin/revive
101-
@echo "Running $@ check"
102-
@tools/bin/revive -formatter friendly -config tools/check/revive.toml ./...
108+
lint-fix: getdeps
109+
@mkdir -p $(INSTALL_PATH)
110+
@if [ -z "$(INSTALL_GCI)" ]; then \
111+
echo "Installing gci v$(GCI_VERSION) to ./bin/" && GOBIN=$(INSTALL_PATH) go install github.com/daixiang0/gci@v$(GCI_VERSION); \
112+
else \
113+
echo "gci v$(GCI_VERSION) already installed"; \
114+
fi
115+
@if [ -z "$(INSTALL_GOFUMPT)" ]; then \
116+
echo "Installing gofumpt v$(GOFUMPT_VERSION) to ./bin/" && GOBIN=$(INSTALL_PATH) go install mvdan.cc/gofumpt@v$(GOFUMPT_VERSION); \
117+
else \
118+
echo "gofumpt v$(GOFUMPT_VERSION) already installed"; \
119+
fi
120+
@echo "Running gofumpt fix"
121+
@$(INSTALL_PATH)/gofumpt -l -w .
122+
@echo "Running gci fix"
123+
@$(INSTALL_PATH)/gci write cmd/ --skip-generated -s standard -s default -s "prefix(github.com/milvus-io)" --custom-order
124+
@$(INSTALL_PATH)/gci write internal/ --skip-generated -s standard -s default -s "prefix(github.com/milvus-io)" --custom-order
125+
@$(INSTALL_PATH)/gci write pkg/ --skip-generated -s standard -s default -s "prefix(github.com/milvus-io)" --custom-order
126+
@$(INSTALL_PATH)/gci write tests/ --skip-generated -s standard -s default -s "prefix(github.com/milvus-io)" --custom-order
127+
@echo "Running golangci-lint auto-fix"
128+
@source $(PWD)/scripts/setenv.sh && GO111MODULE=on $(INSTALL_PATH)/golangci-lint run --fix --timeout=30m --config $(PWD)/.golangci.yml; cd pkg && GO111MODULE=on $(INSTALL_PATH)/golangci-lint run --fix --timeout=30m --config $(PWD)/.golangci.yml
103129

104130
#TODO: Check code specifications by golangci-lint
105131
static-check: getdeps
106132
@echo "Running $@ check"
107-
@GO111MODULE=on $(INSTALL_PATH)/golangci-lint cache clean
108-
@source $(PWD)/scripts/setenv.sh && GO111MODULE=on $(INSTALL_PATH)/golangci-lint run --timeout=30m --config ./.golangci.yml ./internal/...
109-
@source $(PWD)/scripts/setenv.sh && GO111MODULE=on $(INSTALL_PATH)/golangci-lint run --timeout=30m --config ./.golangci.yml ./cmd/...
110-
@source $(PWD)/scripts/setenv.sh && GO111MODULE=on $(INSTALL_PATH)/golangci-lint run --timeout=30m --config ./.golangci.yml ./tests/integration/...
111-
@source $(PWD)/scripts/setenv.sh && cd pkg && GO111MODULE=on $(INSTALL_PATH)/golangci-lint run --timeout=30m --config ../.golangci.yml ./...
133+
@source $(PWD)/scripts/setenv.sh && GO111MODULE=on $(INSTALL_PATH)/golangci-lint run --timeout=30m --config $(PWD)/.golangci.yml; cd pkg && GO111MODULE=on $(INSTALL_PATH)/golangci-lint run --timeout=30m --config $(PWD)/.golangci.yml
112134

113135
verifiers: build-cpp getdeps cppcheck fmt static-check
114136

Diff for: ‎cmd/components/data_coord.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ package components
1919
import (
2020
"context"
2121

22+
"go.uber.org/zap"
23+
2224
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
2325
"github.com/milvus-io/milvus-proto/go-api/v2/milvuspb"
2426
grpcdatacoordclient "github.com/milvus-io/milvus/internal/distributed/datacoord"
2527
"github.com/milvus-io/milvus/internal/util/dependency"
2628
"github.com/milvus-io/milvus/pkg/log"
2729
"github.com/milvus-io/milvus/pkg/util/typeutil"
28-
"go.uber.org/zap"
2930
)
3031

3132
// DataCoord implements grpc server of DataCoord server

Diff for: ‎cmd/components/data_node.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ package components
1919
import (
2020
"context"
2121

22+
"go.uber.org/zap"
23+
2224
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
2325
"github.com/milvus-io/milvus-proto/go-api/v2/milvuspb"
2426
grpcdatanode "github.com/milvus-io/milvus/internal/distributed/datanode"
2527
"github.com/milvus-io/milvus/internal/util/dependency"
2628
"github.com/milvus-io/milvus/pkg/log"
2729
"github.com/milvus-io/milvus/pkg/util/typeutil"
28-
"go.uber.org/zap"
2930
)
3031

3132
// DataNode implements DataNode grpc server

Diff for: ‎cmd/components/index_coord.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ import (
2626
)
2727

2828
// IndexCoord implements IndexCoord grpc server
29-
type IndexCoord struct {
30-
}
29+
type IndexCoord struct{}
3130

3231
// NewIndexCoord creates a new IndexCoord
3332
func NewIndexCoord(ctx context.Context, factory dependency.Factory) (*IndexCoord, error) {

Diff for: ‎cmd/components/index_node.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ package components
1919
import (
2020
"context"
2121

22+
"go.uber.org/zap"
23+
2224
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
2325
"github.com/milvus-io/milvus-proto/go-api/v2/milvuspb"
2426
grpcindexnode "github.com/milvus-io/milvus/internal/distributed/indexnode"
2527
"github.com/milvus-io/milvus/internal/util/dependency"
2628
"github.com/milvus-io/milvus/pkg/log"
2729
"github.com/milvus-io/milvus/pkg/util/typeutil"
28-
"go.uber.org/zap"
2930
)
3031

3132
// IndexNode implements IndexNode grpc server
@@ -43,7 +44,6 @@ func NewIndexNode(ctx context.Context, factory dependency.Factory) (*IndexNode,
4344
}
4445
n.svr = svr
4546
return n, nil
46-
4747
}
4848

4949
// Run starts service

Diff for: ‎cmd/components/proxy.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ package components
1919
import (
2020
"context"
2121

22+
"go.uber.org/zap"
23+
2224
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
2325
"github.com/milvus-io/milvus-proto/go-api/v2/milvuspb"
2426
grpcproxy "github.com/milvus-io/milvus/internal/distributed/proxy"
2527
"github.com/milvus-io/milvus/internal/util/dependency"
2628
"github.com/milvus-io/milvus/pkg/log"
2729
"github.com/milvus-io/milvus/pkg/util/typeutil"
28-
"go.uber.org/zap"
2930
)
3031

3132
// Proxy implements Proxy grpc server

Diff for: ‎cmd/components/query_node.go

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ func NewQueryNode(ctx context.Context, factory dependency.Factory) (*QueryNode,
4646
ctx: ctx,
4747
svr: svr,
4848
}, nil
49-
5049
}
5150

5251
// Run starts service

Diff for: ‎cmd/components/root_coord.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ package components
1919
import (
2020
"context"
2121

22+
"go.uber.org/zap"
23+
2224
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
2325
"github.com/milvus-io/milvus-proto/go-api/v2/milvuspb"
2426
rc "github.com/milvus-io/milvus/internal/distributed/rootcoord"
2527
"github.com/milvus-io/milvus/internal/util/dependency"
2628
"github.com/milvus-io/milvus/pkg/log"
2729
"github.com/milvus-io/milvus/pkg/util/typeutil"
28-
"go.uber.org/zap"
2930
)
3031

3132
// RootCoord implements RoodCoord grpc server

Diff for: ‎cmd/embedded/embedded.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616

1717
package main
1818

19+
import "C"
20+
1921
import (
20-
"C"
2122
"os"
2223

2324
"github.com/milvus-io/milvus/cmd/milvus"

Diff for: ‎cmd/milvus/mck.go

-2
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,6 @@ func getTrashKey(taskType, key string) string {
364364
}
365365

366366
func (c *mck) extractTask(prefix string, keys []string, values []string) {
367-
368367
for i := range keys {
369368
taskID, err := strconv.ParseInt(filepath.Base(keys[i]), 10, 64)
370369
if err != nil {
@@ -520,7 +519,6 @@ func (c *mck) extractVecFieldIndexInfo(taskID int64, infos []*querypb.FieldIndex
520519
func (c *mck) unmarshalTask(taskID int64, t string) (string, []int64, []int64, error) {
521520
header := commonpb.MsgHeader{}
522521
err := proto.Unmarshal([]byte(t), &header)
523-
524522
if err != nil {
525523
return errReturn(taskID, "MsgHeader", err)
526524
}

Diff for: ‎cmd/milvus/stop.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func (c *stop) formatFlags(args []string, flags *flag.FlagSet) {
6161
func (c *stop) stopPid(filename string, runtimeDir string) error {
6262
var pid int
6363

64-
fd, err := os.OpenFile(path.Join(runtimeDir, filename), os.O_RDONLY, 0664)
64+
fd, err := os.OpenFile(path.Join(runtimeDir, filename), os.O_RDONLY, 0o664)
6565
if err != nil {
6666
return err
6767
}

Diff for: ‎cmd/milvus/util.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
)
1515

1616
func makeRuntimeDir(dir string) error {
17-
perm := os.FileMode(0755)
17+
perm := os.FileMode(0o755)
1818
// os.MkdirAll equal to `mkdir -p`
1919
err := os.MkdirAll(dir, perm)
2020
if err != nil {
@@ -63,7 +63,7 @@ func createRuntimeDir(sType string) string {
6363
func createPidFile(w io.Writer, filename string, runtimeDir string) (*flock.Flock, error) {
6464
fileFullName := path.Join(runtimeDir, filename)
6565

66-
fd, err := os.OpenFile(fileFullName, os.O_CREATE|os.O_RDWR, 0664)
66+
fd, err := os.OpenFile(fileFullName, os.O_CREATE|os.O_RDWR, 0o664)
6767
if err != nil {
6868
return nil, fmt.Errorf("file %s is locked, error = %w", filename, err)
6969
}

Diff for: ‎cmd/roles/roles.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ import (
2727
"syscall"
2828
"time"
2929

30+
"github.com/prometheus/client_golang/prometheus"
31+
"github.com/prometheus/client_golang/prometheus/promhttp"
32+
"go.uber.org/zap"
33+
3034
"github.com/milvus-io/milvus/cmd/components"
3135
"github.com/milvus-io/milvus/internal/http"
3236
"github.com/milvus-io/milvus/internal/http/healthz"
@@ -43,9 +47,6 @@ import (
4347
"github.com/milvus-io/milvus/pkg/util/paramtable"
4448
_ "github.com/milvus-io/milvus/pkg/util/symbolizer" // support symbolizer and crash dump
4549
"github.com/milvus-io/milvus/pkg/util/typeutil"
46-
"github.com/prometheus/client_golang/prometheus"
47-
"github.com/prometheus/client_golang/prometheus/promhttp"
48-
"go.uber.org/zap"
4950
)
5051

5152
// all milvus related metrics is in a separate registry

Diff for: ‎cmd/tools/config/generate.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ import (
77
"reflect"
88
"strings"
99

10-
"github.com/milvus-io/milvus/pkg/log"
11-
"github.com/milvus-io/milvus/pkg/util/paramtable"
12-
"github.com/milvus-io/milvus/pkg/util/typeutil"
1310
"github.com/samber/lo"
1411
"go.uber.org/zap"
1512
"golang.org/x/exp/slices"
13+
14+
"github.com/milvus-io/milvus/pkg/log"
15+
"github.com/milvus-io/milvus/pkg/util/paramtable"
16+
"github.com/milvus-io/milvus/pkg/util/typeutil"
1617
)
1718

1819
type DocContent struct {
@@ -106,7 +107,7 @@ type YamlMarshaller struct {
106107
}
107108

108109
func (m *YamlMarshaller) writeYamlRecursive(data []DocContent, level int) {
109-
var topLevels = typeutil.NewOrderedMap[string, []DocContent]()
110+
topLevels := typeutil.NewOrderedMap[string, []DocContent]()
110111
for _, d := range data {
111112
key := strings.Split(d.key, ".")[level]
112113

Diff for: ‎cmd/tools/config/main.go

-1
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,4 @@ func main() {
3636
default:
3737
log.Error(fmt.Sprintf("unknown argument %s", args[1]))
3838
}
39-
4039
}

Diff for: ‎cmd/tools/config/printer.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import (
55
"os"
66
"sort"
77

8-
"github.com/milvus-io/milvus/pkg/log"
98
"github.com/spf13/viper"
109
"go.uber.org/zap"
10+
11+
"github.com/milvus-io/milvus/pkg/log"
1112
)
1213

1314
func ShowYaml(filepath string) {

Diff for: ‎cmd/tools/datameta/main.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ import (
77
"strings"
88

99
"github.com/golang/protobuf/proto"
10+
"go.uber.org/zap"
11+
1012
etcdkv "github.com/milvus-io/milvus/internal/kv/etcd"
1113
"github.com/milvus-io/milvus/internal/proto/datapb"
1214
"github.com/milvus-io/milvus/pkg/log"
1315
"github.com/milvus-io/milvus/pkg/util/etcd"
1416
"github.com/milvus-io/milvus/pkg/util/tsoutil"
15-
"go.uber.org/zap"
1617
)
1718

1819
var (

Diff for: ‎cmd/tools/migration/allocator/atomic_allocator.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package allocator
22

33
import (
4-
"github.com/milvus-io/milvus/pkg/util/typeutil"
54
"go.uber.org/atomic"
5+
6+
"github.com/milvus-io/milvus/pkg/util/typeutil"
67
)
78

89
const (

Diff for: ‎cmd/tools/migration/backend/backend.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ import (
66
"github.com/blang/semver/v4"
77

88
"github.com/milvus-io/milvus/cmd/tools/migration/configs"
9-
10-
"github.com/milvus-io/milvus/cmd/tools/migration/versions"
11-
129
"github.com/milvus-io/milvus/cmd/tools/migration/meta"
10+
"github.com/milvus-io/milvus/cmd/tools/migration/versions"
1311
"github.com/milvus-io/milvus/pkg/util"
1412
)
1513

Diff for: ‎cmd/tools/migration/backend/backup_header.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package backend
33
import (
44
"encoding/json"
55

6-
"github.com/milvus-io/milvus/cmd/tools/migration/console"
7-
86
"github.com/golang/protobuf/proto"
7+
8+
"github.com/milvus-io/milvus/cmd/tools/migration/console"
99
)
1010

1111
type BackupHeaderVersion int32
@@ -78,7 +78,7 @@ func (v *BackupHeaderExtra) ToJSONBytes() []byte {
7878
}
7979

8080
func GetExtra(extra []byte) *BackupHeaderExtra {
81-
var v = newDefaultBackupHeaderExtra()
81+
v := newDefaultBackupHeaderExtra()
8282
err := json.Unmarshal(extra, v)
8383
if err != nil {
8484
console.Error(err.Error())

0 commit comments

Comments
 (0)