From 609cc24309fcae105ed0efbaef57542d6c5c4d71 Mon Sep 17 00:00:00 2001 From: "zhenshan.cao" Date: Wed, 13 Oct 2021 21:46:32 +0800 Subject: [PATCH] Fix golint error in querycoord (#9836) Signed-off-by: zhenshan.cao --- internal/querycoord/cluster_test.go | 4 ++-- internal/querycoord/impl.go | 2 +- internal/querycoord/meta.go | 6 +++--- internal/querycoord/meta_test.go | 4 ++-- internal/querycoord/task.go | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/querycoord/cluster_test.go b/internal/querycoord/cluster_test.go index 571cd3bc37..b6ec91573f 100644 --- a/internal/querycoord/cluster_test.go +++ b/internal/querycoord/cluster_test.go @@ -166,7 +166,7 @@ func TestGrpcRequest(t *testing.T) { }) t.Run("Test AddQueryChannel", func(t *testing.T) { - reqChannel, resChannel, err := cluster.clusterMeta.GetQueryChannel(defaultCollectionID) + reqChannel, resChannel, err := cluster.clusterMeta.getQueryChannel(defaultCollectionID) assert.Nil(t, err) addQueryChannelReq := &querypb.AddQueryChannelRequest{ NodeID: nodeID, @@ -179,7 +179,7 @@ func TestGrpcRequest(t *testing.T) { }) t.Run("Test RemoveQueryChannel", func(t *testing.T) { - reqChannel, resChannel, err := cluster.clusterMeta.GetQueryChannel(defaultCollectionID) + reqChannel, resChannel, err := cluster.clusterMeta.getQueryChannel(defaultCollectionID) assert.Nil(t, err) removeQueryChannelReq := &querypb.RemoveQueryChannelRequest{ NodeID: nodeID, diff --git a/internal/querycoord/impl.go b/internal/querycoord/impl.go index 309b978ca8..a254f1d6f2 100644 --- a/internal/querycoord/impl.go +++ b/internal/querycoord/impl.go @@ -445,7 +445,7 @@ func (qc *QueryCoord) CreateQueryChannel(ctx context.Context, req *querypb.Creat } collectionID := req.CollectionID - queryChannel, queryResultChannel, err := qc.meta.GetQueryChannel(collectionID) + queryChannel, queryResultChannel, err := qc.meta.getQueryChannel(collectionID) if err != nil { status.ErrorCode = commonpb.ErrorCode_UnexpectedError status.Reason = err.Error() diff --git a/internal/querycoord/meta.go b/internal/querycoord/meta.go index 4e00f34603..2bfac10fb1 100644 --- a/internal/querycoord/meta.go +++ b/internal/querycoord/meta.go @@ -63,7 +63,7 @@ type Meta interface { removeDmChannel(collectionID UniqueID, nodeID int64, channels []string) error getQueryChannelInfoByID(collectionID UniqueID) (*querypb.QueryChannelInfo, error) - GetQueryChannel(collectionID UniqueID) (string, string, error) + getQueryChannel(collectionID UniqueID) (string, string, error) setLoadType(collectionID UniqueID, loadType querypb.LoadType) error getLoadType(collectionID UniqueID) (querypb.LoadType, error) @@ -578,7 +578,7 @@ func (m *MetaReplica) removeDmChannel(collectionID UniqueID, nodeID int64, chann return errors.New("addDmChannels: can't find collection in collectionInfos") } -func (m *MetaReplica) GetQueryChannel(collectionID UniqueID) (string, string, error) { +func (m *MetaReplica) getQueryChannel(collectionID UniqueID) (string, string, error) { m.Lock() defer m.Unlock() @@ -601,7 +601,7 @@ func (m *MetaReplica) GetQueryChannel(collectionID UniqueID) (string, string, er } err := saveQueryChannelInfo(collectionID, queryChannelInfo, m.client) if err != nil { - log.Error("GetQueryChannel: save channel to etcd error", zap.Error(err)) + log.Error("getQueryChannel: save channel to etcd error", zap.Error(err)) return "", "", err } m.queryChannelInfos[collectionID] = queryChannelInfo diff --git a/internal/querycoord/meta_test.go b/internal/querycoord/meta_test.go index a7fc6f507b..7bde224ad7 100644 --- a/internal/querycoord/meta_test.go +++ b/internal/querycoord/meta_test.go @@ -232,8 +232,8 @@ func TestMetaFunc(t *testing.T) { assert.Equal(t, defaultSegmentID, infos[0].SegmentID) }) - t.Run("Test GetQueryChannel", func(t *testing.T) { - reqChannel, resChannel, err := meta.GetQueryChannel(defaultCollectionID) + t.Run("Test getQueryChannel", func(t *testing.T) { + reqChannel, resChannel, err := meta.getQueryChannel(defaultCollectionID) assert.NotNil(t, reqChannel) assert.NotNil(t, resChannel) assert.Nil(t, err) diff --git a/internal/querycoord/task.go b/internal/querycoord/task.go index 7bde390826..19e2ff2d0d 100644 --- a/internal/querycoord/task.go +++ b/internal/querycoord/task.go @@ -1038,7 +1038,7 @@ func (lst *LoadSegmentTask) Reschedule(ctx context.Context) ([]task, error) { hasWatchQueryChannel := lst.cluster.hasWatchedQueryChannel(lst.ctx, nodeID, collectionID) if !hasWatchQueryChannel { - queryChannel, queryResultChannel, err := lst.meta.GetQueryChannel(collectionID) + queryChannel, queryResultChannel, err := lst.meta.getQueryChannel(collectionID) if err != nil { return nil, err } @@ -1257,7 +1257,7 @@ func (wdt *WatchDmChannelTask) Reschedule(ctx context.Context) ([]task, error) { hasWatchQueryChannel := wdt.cluster.hasWatchedQueryChannel(wdt.ctx, nodeID, collectionID) if !hasWatchQueryChannel { - queryChannel, queryResultChannel, err := wdt.meta.GetQueryChannel(collectionID) + queryChannel, queryResultChannel, err := wdt.meta.getQueryChannel(collectionID) if err != nil { return nil, err } @@ -1818,7 +1818,7 @@ func assignInternalTask(ctx context.Context, for nodeID, watched := range watchQueryChannelInfo { if !watched { ctx = opentracing.ContextWithSpan(context.Background(), sp) - queryChannel, queryResultChannel, err := meta.GetQueryChannel(collectionID) + queryChannel, queryResultChannel, err := meta.getQueryChannel(collectionID) if err != nil { return err }