From dd09ded49abd4f92eff79c61a33104cf327d8d5a Mon Sep 17 00:00:00 2001 From: groot Date: Sat, 9 Oct 2021 16:00:56 +0800 Subject: [PATCH] Modify package name of distributed/datacoord (#9551) Signed-off-by: yhmo --- .../distributed/datacoord/datacoord_test.go | 180 ------------------ internal/distributed/datacoord/param_table.go | 2 +- .../distributed/datacoord/param_table_test.go | 2 +- internal/distributed/datacoord/service.go | 2 +- .../distributed/datacoord/service_test.go | 2 +- 5 files changed, 4 insertions(+), 184 deletions(-) delete mode 100644 internal/distributed/datacoord/datacoord_test.go diff --git a/internal/distributed/datacoord/datacoord_test.go b/internal/distributed/datacoord/datacoord_test.go deleted file mode 100644 index bdb87f4310..0000000000 --- a/internal/distributed/datacoord/datacoord_test.go +++ /dev/null @@ -1,180 +0,0 @@ -// Copyright (C) 2019-2020 Zilliz. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software distributed under the License -// is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -// or implied. See the License for the specific language governing permissions and limitations under the License. - -package grpcdatacoordclient - -/* -import ( - "context" - "fmt" - "math/rand" - "testing" - - "github.com/milvus-io/milvus/internal/datacoord" - "github.com/milvus-io/milvus/internal/msgstream" - "github.com/milvus-io/milvus/internal/proto/commonpb" - "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/milvuspb" - "github.com/milvus-io/milvus/internal/types" - "github.com/stretchr/testify/assert" -) - -type mockRootCoord struct { - types.RootCoord -} - -func (m *mockRootCoord) Init() error { - return nil -} - -func (m *mockRootCoord) Start() error { - return nil -} - -func (m *mockRootCoord) Stop() error { - return fmt.Errorf("stop error") -} - -func (m *mockRootCoord) GetComponentStates(ctx context.Context) (*internalpb.ComponentStates, error) { - return &internalpb.ComponentStates{ - State: &internalpb.ComponentInfo{ - StateCode: internalpb.StateCode_Healthy, - }, - Status: &commonpb.Status{ - ErrorCode: commonpb.ErrorCode_Success, - }, - SubcomponentStates: []*internalpb.ComponentInfo{ - { - StateCode: internalpb.StateCode_Healthy, - }, - }, - }, nil -} - -func (m *mockRootCoord) GetDdChannel(ctx context.Context) (*milvuspb.StringResponse, error) { - return &milvuspb.StringResponse{ - Status: &commonpb.Status{ - ErrorCode: commonpb.ErrorCode_Success, - Reason: "", - }, - Value: "c1", - }, nil -} - -func (m *mockRootCoord) ShowCollections(ctx context.Context, req *milvuspb.ShowCollectionsRequest) (*milvuspb.ShowCollectionsResponse, error) { - return &milvuspb.ShowCollectionsResponse{ - Status: &commonpb.Status{ - ErrorCode: commonpb.ErrorCode_Success, - Reason: "", - }, - CollectionNames: []string{}, - }, nil -} - -func TestRun(t *testing.T) { - ctx := context.Background() - msFactory := msgstream.NewPmsFactory() - var mockRootCoordCreator = func(ctx context.Context, metaRootPath string, - etcdEndpoints []string) (types.RootCoord, error) { - return &mockRootCoord{}, nil - } - dsServer, err := NewServer(ctx, msFactory, datacoord.SetRootCoordCreator(mockRootCoordCreator)) - assert.Nil(t, err) - - Params.Init() - Params.Port = rand.Int()%100 + 10000 - err = dsServer.Run() - assert.Nil(t, err) - defer func() { - err = dsServer.Stop() - assert.Nil(t, err) - }() - - t.Run("get component states", func(t *testing.T) { - req := &internalpb.GetComponentStatesRequest{} - rsp, err := dsServer.GetComponentStates(ctx, req) - assert.Nil(t, err) - assert.Equal(t, rsp.Status.ErrorCode, commonpb.ErrorCode_Success) - }) - - t.Run("get time tick channel", func(t *testing.T) { - req := &internalpb.GetTimeTickChannelRequest{} - rsp, err := dsServer.GetTimeTickChannel(ctx, req) - assert.Nil(t, err) - assert.Equal(t, rsp.Status.ErrorCode, commonpb.ErrorCode_Success) - }) - - t.Run("get statistics channel", func(t *testing.T) { - req := &internalpb.GetStatisticsChannelRequest{} - rsp, err := dsServer.GetStatisticsChannel(ctx, req) - assert.Nil(t, err) - assert.Equal(t, rsp.Status.ErrorCode, commonpb.ErrorCode_Success) - }) - - t.Run("get segment info", func(t *testing.T) { - req := &datapb.GetSegmentInfoRequest{} - rsp, err := dsServer.GetSegmentInfo(ctx, req) - assert.Nil(t, err) - assert.Equal(t, rsp.Status.ErrorCode, commonpb.ErrorCode_Success) - }) - - t.Run("flush", func(t *testing.T) { - req := &datapb.FlushRequest{} - rsp, err := dsServer.Flush(ctx, req) - assert.Nil(t, err) - assert.Equal(t, rsp.Status.ErrorCode, commonpb.ErrorCode_Success) - }) - - t.Run("assign segment id", func(t *testing.T) { - req := &datapb.AssignSegmentIDRequest{} - rsp, err := dsServer.AssignSegmentID(ctx, req) - assert.Nil(t, err) - assert.Equal(t, rsp.Status.ErrorCode, commonpb.ErrorCode_Success) - }) - - t.Run("get segment states", func(t *testing.T) { - req := &datapb.GetSegmentStatesRequest{} - rsp, err := dsServer.GetSegmentStates(ctx, req) - assert.Nil(t, err) - assert.Equal(t, rsp.Status.ErrorCode, commonpb.ErrorCode_Success) - }) - - t.Run("get insert binlog paths", func(t *testing.T) { - req := &datapb.GetInsertBinlogPathsRequest{} - rsp, err := dsServer.GetInsertBinlogPaths(ctx, req) - assert.Nil(t, err) - assert.Equal(t, rsp.Status.ErrorCode, commonpb.ErrorCode_Success) - }) - - t.Run("get collection statistics", func(t *testing.T) { - req := &datapb.GetCollectionStatisticsRequest{} - rsp, err := dsServer.GetCollectionStatistics(ctx, req) - assert.Nil(t, err) - assert.Equal(t, rsp.Status.ErrorCode, commonpb.ErrorCode_Success) - }) - - t.Run("get partition statistics", func(t *testing.T) { - req := &datapb.GetPartitionStatisticsRequest{} - rsp, err := dsServer.GetPartitionStatistics(ctx, req) - assert.Nil(t, err) - assert.Equal(t, rsp.Status.ErrorCode, commonpb.ErrorCode_Success) - }) - - t.Run("get segment info channel", func(t *testing.T) { - req := &datapb.GetSegmentInfoChannelRequest{} - rsp, err := dsServer.GetSegmentInfoChannel(ctx, req) - assert.Nil(t, err) - assert.Equal(t, rsp.Status.ErrorCode, commonpb.ErrorCode_Success) - }) - -} -*/ diff --git a/internal/distributed/datacoord/param_table.go b/internal/distributed/datacoord/param_table.go index 534398f2be..81367005e4 100644 --- a/internal/distributed/datacoord/param_table.go +++ b/internal/distributed/datacoord/param_table.go @@ -9,7 +9,7 @@ // is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express // or implied. See the License for the specific language governing permissions and limitations under the License. -package grpcdatacoordclient +package grpcdatacoord import ( "strconv" diff --git a/internal/distributed/datacoord/param_table_test.go b/internal/distributed/datacoord/param_table_test.go index 0b3b606057..9404601dc1 100644 --- a/internal/distributed/datacoord/param_table_test.go +++ b/internal/distributed/datacoord/param_table_test.go @@ -9,7 +9,7 @@ // is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express // or implied. See the License for the specific language governing permissions and limitations under the License. -package grpcdatacoordclient +package grpcdatacoord import ( "testing" diff --git a/internal/distributed/datacoord/service.go b/internal/distributed/datacoord/service.go index 6e302164e1..244f266eeb 100644 --- a/internal/distributed/datacoord/service.go +++ b/internal/distributed/datacoord/service.go @@ -10,7 +10,7 @@ // or implied. See the License for the specific language governing permissions and limitations under the License. // Package grpcdatacoordclient contains grpc interfaces of datacoord -package grpcdatacoordclient +package grpcdatacoord import ( "context" diff --git a/internal/distributed/datacoord/service_test.go b/internal/distributed/datacoord/service_test.go index ed94f3ed43..050acadce1 100644 --- a/internal/distributed/datacoord/service_test.go +++ b/internal/distributed/datacoord/service_test.go @@ -9,7 +9,7 @@ // is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express // or implied. See the License for the specific language governing permissions and limitations under the License. -package grpcdatacoordclient +package grpcdatacoord import ( "context"