Fix ReplicaInfo package name (milvus-io#16400)

Fix milvus-io#16399 PR 16373 breaks the build after ReplicaInfo moved from querypb to milvuspb Also fix problem in Makefile Limit action/setup-go version to ~1.17.1(>=1.17.1 <1.18.0) Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
zhagnlu · Apr 6, 2022 · 4cb7c28 · 4cb7c28
1 parent 086e896
commit 4cb7c28
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/code-checker.yaml b/.github/workflows/code-checker.yaml
@@ -82,7 +82,7 @@ jobs:
         uses: actions/setup-go@v2.2.0
         if: ${{  matrix.os == 'macos-11' }}
         with:
-          go-version: '^1.17.1'
+          go-version: '~1.17.1'
       - name: Mac Cache Go Mod Volumes
         if: ${{  matrix.os == 'macos-11' }}
         uses: actions/cache@v1

diff --git a/Makefile b/Makefile
@@ -52,7 +52,7 @@ cppcheck:
 generated-proto-go: export protoc:=${PWD}/cmake_build/thirdparty/protobuf/protobuf-build/protoc
 generated-proto-go: build-cpp
 	@mkdir -p ${GOPATH}/bin
-	@which protoc-gen-go 1>/dev/null || (echo "Installing protoc-gen-go" && cd /tmp && go get github.com/golang/protobuf/protoc-gen-go@v1.3.2)
+	@which protoc-gen-go 1>/dev/null || (echo "Installing protoc-gen-go" && cd /tmp && go install github.com/golang/protobuf/protoc-gen-go@v1.3.2)
 	@(env bash $(PWD)/scripts/proto_gen_go.sh)
 
 check-proto-product: generated-proto-go

diff --git a/internal/querynode/shard_node_detector.go b/internal/querynode/shard_node_detector.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/milvus-io/milvus/internal/log"
-	"github.com/milvus-io/milvus/internal/proto/querypb"
+	"github.com/milvus-io/milvus/internal/proto/milvuspb"
 	"go.etcd.io/etcd/api/v3/mvccpb"
 	v3rpc "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
 	clientv3 "go.etcd.io/etcd/client/v3"
@@ -155,7 +155,7 @@ func (nd *etcdShardNodeDetector) watch(ch clientv3.WatchChan, collectionID, repl
 
 func (nd *etcdShardNodeDetector) handlePutEvent(e *clientv3.Event, collectionID, replicaID int64) {
 	var err error
-	var info, prevInfo *querypb.ReplicaInfo
+	var info, prevInfo *milvuspb.ReplicaInfo
 	info, err = nd.parseReplicaInfo(e.Kv.Value)
 	if err != nil {
 		log.Warn("failed to handle node event", zap.Any("event", e), zap.Error(err))
@@ -261,8 +261,8 @@ func (nd *etcdShardNodeDetector) handleDelEvent(e *clientv3.Event, collectionID,
 	}
 }
 
-func (nd *etcdShardNodeDetector) parseReplicaInfo(bs []byte) (*querypb.ReplicaInfo, error) {
-	info := &querypb.ReplicaInfo{}
+func (nd *etcdShardNodeDetector) parseReplicaInfo(bs []byte) (*milvuspb.ReplicaInfo, error) {
+	info := &milvuspb.ReplicaInfo{}
 	err := proto.Unmarshal(bs, info)
 	return info, err
 }
diff --git a/internal/querynode/shard_node_detector_test.go b/internal/querynode/shard_node_detector_test.go
@@ -28,7 +28,7 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/milvus-io/milvus/internal/proto/querypb"
+	"github.com/milvus-io/milvus/internal/proto/milvuspb"
 	"github.com/milvus-io/milvus/internal/util/funcutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -73,9 +73,9 @@ func TestEtcdShardNodeDetector_watch(t *testing.T) {
 	type testCase struct {
 		name               string
 		ids                []int64
-		oldRecords         map[string]*querypb.ReplicaInfo
+		oldRecords         map[string]*milvuspb.ReplicaInfo
 		oldGarbage         map[string]string
-		updateRecords      map[string]*querypb.ReplicaInfo
+		updateRecords      map[string]*milvuspb.ReplicaInfo
 		updateGarbage      map[string]string
 		delRecords         []string
 		expectInitEvents   []nodeEvent
@@ -88,7 +88,7 @@ func TestEtcdShardNodeDetector_watch(t *testing.T) {
 		{
 			name: "init normal case",
 			ids:  []int64{1, 2},
-			oldRecords: map[string]*querypb.ReplicaInfo{
+			oldRecords: map[string]*milvuspb.ReplicaInfo{
 				"replica_1": {
 					CollectionID: 1,
 					ReplicaID:    1,
@@ -116,7 +116,7 @@ func TestEtcdShardNodeDetector_watch(t *testing.T) {
 		{
 			name: "normal case with other replica",
 			ids:  []int64{1, 2},
-			oldRecords: map[string]*querypb.ReplicaInfo{
+			oldRecords: map[string]*milvuspb.ReplicaInfo{
 				"replica_1": {
 					CollectionID: 1,
 					ReplicaID:    1,
@@ -146,7 +146,7 @@ func TestEtcdShardNodeDetector_watch(t *testing.T) {
 		{
 			name: "init normal missing node",
 			ids:  []int64{1},
-			oldRecords: map[string]*querypb.ReplicaInfo{
+			oldRecords: map[string]*milvuspb.ReplicaInfo{
 				"replica_1": {
 					CollectionID: 1,
 					ReplicaID:    1,
@@ -166,7 +166,7 @@ func TestEtcdShardNodeDetector_watch(t *testing.T) {
 		{
 			name: "normal updates",
 			ids:  []int64{1, 2, 3},
-			oldRecords: map[string]*querypb.ReplicaInfo{
+			oldRecords: map[string]*milvuspb.ReplicaInfo{
 				"replica_1": {
 					CollectionID: 1,
 					ReplicaID:    1,
@@ -180,7 +180,7 @@ func TestEtcdShardNodeDetector_watch(t *testing.T) {
 					eventType: nodeAdd,
 				},
 			},
-			updateRecords: map[string]*querypb.ReplicaInfo{
+			updateRecords: map[string]*milvuspb.ReplicaInfo{
 				"replica_1": {
 					CollectionID: 1,
 					ReplicaID:    1,
@@ -218,7 +218,7 @@ func TestEtcdShardNodeDetector_watch(t *testing.T) {
 		{
 			name: "normal updates with other replica",
 			ids:  []int64{1, 2},
-			oldRecords: map[string]*querypb.ReplicaInfo{
+			oldRecords: map[string]*milvuspb.ReplicaInfo{
 				"replica_1": {
 					CollectionID: 1,
 					ReplicaID:    1,
@@ -232,7 +232,7 @@ func TestEtcdShardNodeDetector_watch(t *testing.T) {
 					eventType: nodeAdd,
 				},
 			},
-			updateRecords: map[string]*querypb.ReplicaInfo{
+			updateRecords: map[string]*milvuspb.ReplicaInfo{
 				"replica_1": {
 					CollectionID: 1,
 					ReplicaID:    1,
@@ -265,7 +265,7 @@ func TestEtcdShardNodeDetector_watch(t *testing.T) {
 		{
 			name: "normal deletes",
 			ids:  []int64{1, 2},
-			oldRecords: map[string]*querypb.ReplicaInfo{
+			oldRecords: map[string]*milvuspb.ReplicaInfo{
 				"replica_1": {
 					CollectionID: 1,
 					ReplicaID:    1,