milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Construct all success status with merr (#27226) 

Signed-off-by: yah01 <yah2er0ne@outlook.com>
pull/27250/head
yah01 2023-09-20 10:57:23 +08:00 committed by GitHub
parent 338848fbc3
commit b4f86ea55e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 286 additions and 831 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/allocator/id_allocator_test.go
View File

@ -20,8 +20,8 @@ import (
"context"
"testing"
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
"github.com/milvus-io/milvus/internal/proto/rootcoordpb"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@ -31,12 +31,9 @@ type mockIDAllocator struct {
func (tso *mockIDAllocator) AllocID(ctx context.Context, req *rootcoordpb.AllocIDRequest) (*rootcoordpb.AllocIDResponse, error) {
return &rootcoordpb.AllocIDResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
ID: int64(1),
Count: req.Count,
Status: merr.Status(nil),
ID: int64(1),
Count: req.Count,
}, nil
}

26
internal/datacoord/index_builder_test.go
View File

@ -36,6 +36,7 @@ import (
"github.com/milvus-io/milvus/internal/proto/indexpb"
"github.com/milvus-io/milvus/internal/types"
"github.com/milvus-io/milvus/pkg/common"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/paramtable"
)
@ -774,10 +775,7 @@ func TestIndexBuilder_Error(t *testing.T) {
},
CallGetJobStats: func(ctx context.Context, in *indexpb.GetJobStatsRequest) (*indexpb.GetJobStatsResponse, error) {
return &indexpb.GetJobStatsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
TaskSlots: 1,
}, nil
},
@ -805,10 +803,7 @@ func TestIndexBuilder_Error(t *testing.T) {
},
CallGetJobStats: func(ctx context.Context, in *indexpb.GetJobStatsRequest) (*indexpb.GetJobStatsResponse, error) {
return &indexpb.GetJobStatsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
TaskSlots: 1,
}, nil
},
@ -942,10 +937,7 @@ func TestIndexBuilder_Error(t *testing.T) {
nodeID: &indexnode.Mock{
CallQueryJobs: func(ctx context.Context, in *indexpb.QueryJobsRequest) (*indexpb.QueryJobsResponse, error) {
return &indexpb.QueryJobsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
IndexInfos: []*indexpb.IndexTaskInfo{
{
BuildID: buildID,
@ -978,10 +970,7 @@ func TestIndexBuilder_Error(t *testing.T) {
nodeID: &indexnode.Mock{
CallQueryJobs: func(ctx context.Context, in *indexpb.QueryJobsRequest) (*indexpb.QueryJobsResponse, error) {
return &indexpb.QueryJobsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
IndexInfos: []*indexpb.IndexTaskInfo{
{
BuildID: buildID,
@ -1014,10 +1003,7 @@ func TestIndexBuilder_Error(t *testing.T) {
nodeID: &indexnode.Mock{
CallQueryJobs: func(ctx context.Context, in *indexpb.QueryJobsRequest) (*indexpb.QueryJobsResponse, error) {
return &indexpb.QueryJobsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
IndexInfos: nil,
}, nil
},

21
internal/datacoord/indexnode_manager_test.go
View File

@ -28,6 +28,7 @@ import (
"github.com/milvus-io/milvus/internal/metastore/model"
"github.com/milvus-io/milvus/internal/proto/indexpb"
"github.com/milvus-io/milvus/internal/types"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/stretchr/testify/assert"
)
@ -123,10 +124,7 @@ func TestIndexNodeManager_PeekClient(t *testing.T) {
CallGetJobStats: func(ctx context.Context, req *indexpb.GetJobStatsRequest) (*indexpb.GetJobStatsResponse, error) {
return &indexpb.GetJobStatsResponse{
TaskSlots: 1,
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
}, nil
},
},
@ -134,10 +132,7 @@ func TestIndexNodeManager_PeekClient(t *testing.T) {
CallGetJobStats: func(ctx context.Context, req *indexpb.GetJobStatsRequest) (*indexpb.GetJobStatsResponse, error) {
return &indexpb.GetJobStatsResponse{
TaskSlots: 10,
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
}, nil
},
},
@ -159,10 +154,7 @@ func TestIndexNodeManager_ClientSupportDisk(t *testing.T) {
1: &indexnode.Mock{
CallGetJobStats: func(ctx context.Context, in *indexpb.GetJobStatsRequest) (*indexpb.GetJobStatsResponse, error) {
return &indexpb.GetJobStatsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
TaskSlots: 1,
JobInfos: nil,
EnableDisk: true,
@ -184,10 +176,7 @@ func TestIndexNodeManager_ClientSupportDisk(t *testing.T) {
1: &indexnode.Mock{
CallGetJobStats: func(ctx context.Context, in *indexpb.GetJobStatsRequest) (*indexpb.GetJobStatsResponse, error) {
return &indexpb.GetJobStatsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
TaskSlots: 1,
JobInfos: nil,
EnableDisk: false,

15
internal/datacoord/metrics_info_test.go
View File

@ -25,6 +25,7 @@ import (
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
"github.com/milvus-io/milvus-proto/go-api/v2/milvuspb"
"github.com/milvus-io/milvus/internal/types"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/metricsinfo"
"github.com/milvus-io/milvus/pkg/util/typeutil"
"github.com/stretchr/testify/assert"
@ -113,9 +114,7 @@ func TestGetDataNodeMetrics(t *testing.T) {
// mock parse error
mockFailClientCreator = getMockFailedClientCreator(func() (*milvuspb.GetMetricsResponse, error) {
return &milvuspb.GetMetricsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
Response: `{"error_reason": 1}`,
}, nil
})
@ -164,10 +163,7 @@ func TestGetIndexNodeMetrics(t *testing.T) {
info, err = svr.getIndexNodeMetrics(ctx, req, &mockMetricIndexNodeClient{
mock: func() (*milvuspb.GetMetricsResponse, error) {
return &milvuspb.GetMetricsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
Response: "XXXXXXXXXXXXX",
ComponentName: "indexnode100",
}, nil
@ -201,10 +197,7 @@ func TestGetIndexNodeMetrics(t *testing.T) {
}
return &milvuspb.GetMetricsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
Response: resp,
ComponentName: metricsinfo.ConstructComponentName(typeutil.IndexNodeRole, nodeID),
}, nil

74
internal/datacoord/mock_test.go
View File

@ -167,9 +167,7 @@ func newMockDataNodeClient(id int64, ch chan interface{}) (*mockDataNodeClient,
state: commonpb.StateCode_Initializing,
ch: ch,
addImportSegmentResp: &datapb.AddImportSegmentResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
},
}, nil
}
@ -225,19 +223,13 @@ func (c *mockDataNodeClient) FlushSegments(ctx context.Context, in *datapb.Flush
func (c *mockDataNodeClient) ResendSegmentStats(ctx context.Context, req *datapb.ResendSegmentStatsRequest) (*datapb.ResendSegmentStatsResponse, error) {
return &datapb.ResendSegmentStatsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
}, nil
}
func (c *mockDataNodeClient) ShowConfigurations(ctx context.Context, req *internalpb.ShowConfigurationsRequest) (*internalpb.ShowConfigurationsResponse, error) {
return &internalpb.ShowConfigurationsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
}, nil
}
@ -264,10 +256,7 @@ func (c *mockDataNodeClient) GetMetrics(ctx context.Context, req *milvuspb.GetMe
}
return &milvuspb.GetMetricsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
Response: resp,
ComponentName: metricsinfo.ConstructComponentName(typeutil.DataNodeRole, nodeID),
}, nil
@ -372,10 +361,7 @@ func (m *mockRootCoordService) GetComponentStates(ctx context.Context) (*milvusp
ExtraInfo: []*commonpb.KeyValuePair{},
},
SubcomponentStates: []*milvuspb.ComponentInfo{},
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
}, nil
}
@ -405,10 +391,7 @@ func (m *mockRootCoordService) DescribeCollection(ctx context.Context, req *milv
}, nil
}
return &milvuspb.DescribeCollectionResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
Schema: &schemapb.CollectionSchema{
Name: "test",
},
@ -423,10 +406,7 @@ func (m *mockRootCoordService) DescribeCollectionInternal(ctx context.Context, r
func (m *mockRootCoordService) ShowCollections(ctx context.Context, req *milvuspb.ShowCollectionsRequest) (*milvuspb.ShowCollectionsResponse, error) {
return &milvuspb.ShowCollectionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
CollectionNames: []string{"test"},
}, nil
}
@ -461,10 +441,7 @@ func (m *mockRootCoordService) HasPartition(ctx context.Context, req *milvuspb.H
func (m *mockRootCoordService) ShowPartitions(ctx context.Context, req *milvuspb.ShowPartitionsRequest) (*milvuspb.ShowPartitionsResponse, error) {
return &milvuspb.ShowPartitionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
PartitionNames: []string{"_default"},
PartitionIDs: []int64{0},
}, nil
@ -484,10 +461,7 @@ func (m *mockRootCoordService) AllocTimestamp(ctx context.Context, req *rootcoor
phy := time.Now().UnixNano() / int64(time.Millisecond)
ts := tsoutil.ComposeTS(phy, val)
return &rootcoordpb.AllocTimestampResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
Timestamp: ts,
Count: req.Count,
}, nil
@ -499,12 +473,9 @@ func (m *mockRootCoordService) AllocID(ctx context.Context, req *rootcoordpb.All
}
val := atomic.AddInt64(&m.cnt, int64(req.Count))
return &rootcoordpb.AllocIDResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
ID: val,
Count: req.Count,
Status: merr.Status(nil),
ID: val,
Count: req.Count,
}, nil
}
@ -523,11 +494,8 @@ func (m *mockRootCoordService) DescribeSegments(ctx context.Context, req *rootco
func (m *mockRootCoordService) GetDdChannel(ctx context.Context) (*milvuspb.StringResponse, error) {
return &milvuspb.StringResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Value: "ddchannel",
Status: merr.Status(nil),
Value: "ddchannel",
}, nil
}
@ -549,10 +517,7 @@ func (m *mockRootCoordService) AddNewSegment(ctx context.Context, in *datapb.Seg
func (m *mockRootCoordService) ShowConfigurations(ctx context.Context, req *internalpb.ShowConfigurationsRequest) (*internalpb.ShowConfigurationsResponse, error) {
return &internalpb.ShowConfigurationsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
}, nil
}
@ -587,10 +552,7 @@ func (m *mockRootCoordService) GetMetrics(ctx context.Context, req *milvuspb.Get
}
return &milvuspb.GetMetricsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
Response: resp,
ComponentName: metricsinfo.ConstructComponentName(typeutil.RootCoordRole, nodeID),
}, nil
@ -611,9 +573,7 @@ func (m *mockRootCoordService) ListImportTasks(ctx context.Context, in *milvuspb
}
func (m *mockRootCoordService) ReportImport(ctx context.Context, req *rootcoordpb.ImportResult) (*commonpb.Status, error) {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil
return merr.Status(nil), nil
}
type mockCompactionHandler struct {

10
internal/datanode/allocator/allocator_test.go
View File

@ -23,9 +23,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
"github.com/milvus-io/milvus/internal/proto/rootcoordpb"
"github.com/milvus-io/milvus/internal/types"
"github.com/milvus-io/milvus/pkg/util/merr"
)
func TestGetGenerator(t *testing.T) {
@ -83,10 +83,8 @@ type RootCoordFactory struct {
func (m *RootCoordFactory) AllocID(ctx context.Context, in *rootcoordpb.AllocIDRequest) (*rootcoordpb.AllocIDResponse, error) {
resp := &rootcoordpb.AllocIDResponse{
ID: m.ID,
Count: in.GetCount(),
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}}
ID: m.ID,
Count: in.GetCount(),
Status: merr.Status(nil)}
return resp, nil
}

59
internal/datanode/mock_test.go
View File

@ -25,6 +25,7 @@ import (
"time"
"github.com/cockroachdb/errors"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/tsoutil"
"go.uber.org/zap"
@ -204,9 +205,7 @@ func (ds *DataCoordFactory) AssignSegmentID(ctx context.Context, req *datapb.Ass
return nil, errors.New("Error")
}
res := &datapb.AssignSegmentIDResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
SegIDAssignments: []*datapb.SegmentIDAssignment{
{
SegID: 666,
@ -253,15 +252,11 @@ func (ds *DataCoordFactory) DropVirtualChannel(ctx context.Context, req *datapb.
}
func (ds *DataCoordFactory) UpdateSegmentStatistics(ctx context.Context, req *datapb.UpdateSegmentStatisticsRequest) (*commonpb.Status, error) {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil
return merr.Status(nil), nil
}
func (ds *DataCoordFactory) UpdateChannelCheckpoint(ctx context.Context, req *datapb.UpdateChannelCheckpointRequest) (*commonpb.Status, error) {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil
return merr.Status(nil), nil
}
func (ds *DataCoordFactory) ReportDataNodeTtMsgs(ctx context.Context, req *datapb.ReportDataNodeTtMsgsRequest) (*commonpb.Status, error) {
@ -273,33 +268,23 @@ func (ds *DataCoordFactory) ReportDataNodeTtMsgs(ctx context.Context, req *datap
ErrorCode: commonpb.ErrorCode_UnexpectedError,
}, nil
}
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil
return merr.Status(nil), nil
}
func (ds *DataCoordFactory) SaveImportSegment(ctx context.Context, req *datapb.SaveImportSegmentRequest) (*commonpb.Status, error) {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil
return merr.Status(nil), nil
}
func (ds *DataCoordFactory) UnsetIsImportingState(context.Context, *datapb.UnsetIsImportingStateRequest) (*commonpb.Status, error) {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil
return merr.Status(nil), nil
}
func (ds *DataCoordFactory) MarkSegmentsDropped(context.Context, *datapb.MarkSegmentsDroppedRequest) (*commonpb.Status, error) {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil
return merr.Status(nil), nil
}
func (ds *DataCoordFactory) BroadcastAlteredCollection(ctx context.Context, req *datapb.AlterCollectionRequest) (*commonpb.Status, error) {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil
return merr.Status(nil), nil
}
func (ds *DataCoordFactory) CheckHealth(ctx context.Context, req *milvuspb.CheckHealthRequest) (*milvuspb.CheckHealthResponse, error) {
@ -333,10 +318,8 @@ func (ds *DataCoordFactory) GetSegmentInfo(ctx context.Context, req *datapb.GetS
}
}
return &datapb.GetSegmentInfoResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Infos: segmentInfos,
Status: merr.Status(nil),
Infos: segmentInfos,
}, nil
}
@ -1044,9 +1027,7 @@ func (m *RootCoordFactory) DescribeCollectionInternal(ctx context.Context, in *m
func (m *RootCoordFactory) ShowPartitions(ctx context.Context, req *milvuspb.ShowPartitionsRequest) (*milvuspb.ShowPartitionsResponse, error) {
if m.ShowPartitionsErr {
return &milvuspb.ShowPartitionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, fmt.Errorf("mock show partitions error")
}
@ -1060,9 +1041,7 @@ func (m *RootCoordFactory) ShowPartitions(ctx context.Context, req *milvuspb.Sho
}
return &milvuspb.ShowPartitionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
PartitionNames: m.ShowPartitionsNames,
PartitionIDs: m.ShowPartitionsIDs,
}, nil
@ -1072,9 +1051,7 @@ func (m *RootCoordFactory) GetComponentStates(ctx context.Context) (*milvuspb.Co
return &milvuspb.ComponentStates{
State: &milvuspb.ComponentInfo{},
SubcomponentStates: make([]*milvuspb.ComponentInfo, 0),
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
@ -1085,18 +1062,14 @@ func (m *RootCoordFactory) ReportImport(ctx context.Context, req *rootcoordpb.Im
}
}
if m.ReportImportErr {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, fmt.Errorf("mock report import error")
return merr.Status(nil), fmt.Errorf("mock report import error")
}
if m.ReportImportNotSuccess {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_UnexpectedError,
}, nil
}
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil
return merr.Status(nil), nil
}
// FailMessageStreamFactory mock MessageStreamFactory failure

5
internal/datanode/timetick_sender_test.go
View File

@ -28,6 +28,7 @@ import (
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
"github.com/milvus-io/milvus/internal/mocks"
"github.com/milvus-io/milvus/internal/proto/datapb"
"github.com/milvus-io/milvus/pkg/util/merr"
)
func TestTimetickManagerNormal(t *testing.T) {
@ -174,9 +175,7 @@ func TestTimetickManagerSendReport(t *testing.T) {
if req.GetBase().Timestamp > uint64(tsInMill) {
validTs.Store(true)
}
}).Return(&commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil)
}).Return(merr.Status(nil), nil)
manager := newTimeTickSender(mockDataCoord, 0)
go manager.start(ctx)

21
internal/distributed/datacoord/service_test.go
View File

@ -29,6 +29,7 @@ import (
"github.com/milvus-io/milvus/internal/proto/indexpb"
"github.com/milvus-io/milvus/internal/proto/internalpb"
"github.com/milvus-io/milvus/internal/types"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/paramtable"
"github.com/milvus-io/milvus/pkg/util/tikv"
"github.com/stretchr/testify/assert"
@ -543,9 +544,7 @@ func Test_NewServer(t *testing.T) {
t.Run("update seg stat", func(t *testing.T) {
server.dataCoord = &MockDataCoord{
updateSegStatResp: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
updateSegStatResp: merr.Status(nil),
}
resp, err := server.UpdateSegmentStatistics(ctx, nil)
assert.NoError(t, err)
@ -554,9 +553,7 @@ func Test_NewServer(t *testing.T) {
t.Run("UpdateChannelCheckpoint", func(t *testing.T) {
server.dataCoord = &MockDataCoord{
updateChanPos: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
updateChanPos: merr.Status(nil),
}
resp, err := server.UpdateChannelCheckpoint(ctx, nil)
assert.NoError(t, err)
@ -565,9 +562,7 @@ func Test_NewServer(t *testing.T) {
t.Run("save import segment", func(t *testing.T) {
server.dataCoord = &MockDataCoord{
addSegmentResp: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
addSegmentResp: merr.Status(nil),
}
resp, err := server.SaveImportSegment(ctx, nil)
assert.NoError(t, err)
@ -576,9 +571,7 @@ func Test_NewServer(t *testing.T) {
t.Run("unset isImporting state", func(t *testing.T) {
server.dataCoord = &MockDataCoord{
unsetIsImportingStateResp: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
unsetIsImportingStateResp: merr.Status(nil),
}
resp, err := server.UnsetIsImportingState(ctx, nil)
assert.NoError(t, err)
@ -587,9 +580,7 @@ func Test_NewServer(t *testing.T) {
t.Run("mark segments dropped", func(t *testing.T) {
server.dataCoord = &MockDataCoord{
markSegmentsDroppedResp: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
markSegmentsDroppedResp: merr.Status(nil),
}
resp, err := server.MarkSegmentsDropped(ctx, nil)
assert.NoError(t, err)

13
internal/distributed/datanode/service_test.go
View File

@ -28,6 +28,7 @@ import (
"github.com/milvus-io/milvus/internal/proto/datapb"
"github.com/milvus-io/milvus/internal/proto/internalpb"
"github.com/milvus-io/milvus/internal/types"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/paramtable"
"github.com/milvus-io/milvus/pkg/util/typeutil"
"github.com/stretchr/testify/assert"
@ -168,9 +169,7 @@ func (m *mockDataCoord) GetComponentStates(ctx context.Context) (*milvuspb.Compo
State: &milvuspb.ComponentInfo{
StateCode: commonpb.StateCode_Healthy,
},
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
SubcomponentStates: []*milvuspb.ComponentInfo{
{
StateCode: commonpb.StateCode_Healthy,
@ -198,9 +197,7 @@ func (m *mockRootCoord) GetComponentStates(ctx context.Context) (*milvuspb.Compo
State: &milvuspb.ComponentInfo{
StateCode: commonpb.StateCode_Healthy,
},
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
SubcomponentStates: []*milvuspb.ComponentInfo{
{
StateCode: commonpb.StateCode_Healthy,
@ -319,9 +316,7 @@ func Test_NewServer(t *testing.T) {
server.datanode = &MockDataNode{
status: &commonpb.Status{},
addImportSegmentResp: &datapb.AddImportSegmentResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
},
}
resp, err := server.AddImportSegment(ctx, nil)

5
internal/distributed/querycoord/service_test.go
View File

@ -25,6 +25,7 @@ import (
"github.com/milvus-io/milvus/internal/mocks"
"github.com/milvus-io/milvus/internal/types"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/paramtable"
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
@ -134,9 +135,7 @@ func Test_NewServer(t *testing.T) {
}
mqc := getQueryCoord()
successStatus := &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}
successStatus := merr.Status(nil)
t.Run("Run", func(t *testing.T) {
server.queryCoord = mqc

5
internal/distributed/rootcoord/service_test.go
View File

@ -37,6 +37,7 @@ import (
"github.com/milvus-io/milvus/internal/rootcoord"
"github.com/milvus-io/milvus/internal/types"
"github.com/milvus-io/milvus/pkg/util/etcd"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/paramtable"
"github.com/milvus-io/milvus/pkg/util/tikv"
)
@ -125,9 +126,7 @@ func (m *mockDataCoord) GetComponentStates(ctx context.Context) (*milvuspb.Compo
State: &milvuspb.ComponentInfo{
StateCode: commonpb.StateCode_Healthy,
},
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
SubcomponentStates: []*milvuspb.ComponentInfo{
{
StateCode: commonpb.StateCode_Healthy,

67
internal/proxy/data_coord_mock_test.go
View File

@ -26,6 +26,7 @@ import (
"github.com/milvus-io/milvus/internal/proto/internalpb"
"github.com/milvus-io/milvus/internal/types"
"github.com/milvus-io/milvus/pkg/util/funcutil"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/typeutil"
"github.com/milvus-io/milvus/pkg/util/uniquegenerator"
"go.uber.org/atomic"
@ -86,20 +87,14 @@ func (coord *DataCoordMock) GetComponentStates(ctx context.Context) (*milvuspb.C
ExtraInfo: nil,
},
SubcomponentStates: nil,
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
}, nil
}
func (coord *DataCoordMock) GetStatisticsChannel(ctx context.Context) (*milvuspb.StringResponse, error) {
return &milvuspb.StringResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Value: coord.statisticsChannel,
Status: merr.Status(nil),
Value: coord.statisticsChannel,
}, nil
}
@ -109,11 +104,8 @@ func (coord *DataCoordMock) Register() error {
func (coord *DataCoordMock) GetTimeTickChannel(ctx context.Context) (*milvuspb.StringResponse, error) {
return &milvuspb.StringResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Value: coord.timeTickChannel,
Status: merr.Status(nil),
Value: coord.timeTickChannel,
}, nil
}
@ -275,39 +267,24 @@ func (coord *DataCoordMock) Import(ctx context.Context, req *datapb.ImportTaskRe
}
func (coord *DataCoordMock) UpdateSegmentStatistics(ctx context.Context, req *datapb.UpdateSegmentStatisticsRequest) (*commonpb.Status, error) {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, nil
return merr.Status(nil), nil
}
func (coord *DataCoordMock) UpdateChannelCheckpoint(ctx context.Context, req *datapb.UpdateChannelCheckpointRequest) (*commonpb.Status, error) {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, nil
return merr.Status(nil), nil
}
func (coord *DataCoordMock) CreateIndex(ctx context.Context, req *indexpb.CreateIndexRequest) (*commonpb.Status, error) {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, nil
return merr.Status(nil), nil
}
func (coord *DataCoordMock) DropIndex(ctx context.Context, req *indexpb.DropIndexRequest) (*commonpb.Status, error) {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, nil
return merr.Status(nil), nil
}
func (coord *DataCoordMock) GetIndexState(ctx context.Context, req *indexpb.GetIndexStateRequest) (*indexpb.GetIndexStateResponse, error) {
return &indexpb.GetIndexStateResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
State: commonpb.IndexState_Finished,
FailReason: "",
}, nil
@ -316,29 +293,21 @@ func (coord *DataCoordMock) GetIndexState(ctx context.Context, req *indexpb.GetI
// GetSegmentIndexState gets the index state of the segments in the request from RootCoord.
func (coord *DataCoordMock) GetSegmentIndexState(ctx context.Context, req *indexpb.GetSegmentIndexStateRequest) (*indexpb.GetSegmentIndexStateResponse, error) {
return &indexpb.GetSegmentIndexStateResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
}, nil
}
// GetIndexInfos gets the index files of the IndexBuildIDs in the request from RootCoordinator.
func (coord *DataCoordMock) GetIndexInfos(ctx context.Context, req *indexpb.GetIndexInfoRequest) (*indexpb.GetIndexInfoResponse, error) {
return &indexpb.GetIndexInfoResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
}, nil
}
// DescribeIndex describe the index info of the collection.
func (coord *DataCoordMock) DescribeIndex(ctx context.Context, req *indexpb.DescribeIndexRequest) (*indexpb.DescribeIndexResponse, error) {
return &indexpb.DescribeIndexResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
IndexInfos: nil,
}, nil
}
@ -346,9 +315,7 @@ func (coord *DataCoordMock) DescribeIndex(ctx context.Context, req *indexpb.Desc
// GetIndexStatistics get the statistics of the index.
func (coord *DataCoordMock) GetIndexStatistics(ctx context.Context, req *indexpb.GetIndexStatisticsRequest) (*indexpb.GetIndexStatisticsResponse, error) {
return &indexpb.GetIndexStatisticsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
IndexInfos: nil,
}, nil
}
@ -356,9 +323,7 @@ func (coord *DataCoordMock) GetIndexStatistics(ctx context.Context, req *indexpb
// GetIndexBuildProgress get the index building progress by num rows.
func (coord *DataCoordMock) GetIndexBuildProgress(ctx context.Context, req *indexpb.GetIndexBuildProgressRequest) (*indexpb.GetIndexBuildProgressResponse, error) {
return &indexpb.GetIndexBuildProgressResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}

32
internal/proxy/impl_test.go
View File

@ -195,9 +195,7 @@ func TestProxyRenameCollection(t *testing.T) {
t.Run("rename ok", func(t *testing.T) {
rc := mocks.NewRootCoord(t)
rc.On("RenameCollection", mock.Anything, mock.Anything).
Return(&commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil)
Return(merr.Status(nil), nil)
node := &Proxy{
session: &sessionutil.Session{ServerID: 1},
rootCoord: rc,
@ -696,9 +694,7 @@ func TestProxy_Connect(t *testing.T) {
mock.Anything,
mock.Anything,
).Return(&milvuspb.ListDatabasesResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
DbNames: []string{},
}, nil)
@ -721,9 +717,7 @@ func TestProxy_Connect(t *testing.T) {
mock.Anything,
mock.Anything,
).Return(&milvuspb.ListDatabasesResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
DbNames: []string{"20230525"},
}, nil)
@ -754,9 +748,7 @@ func TestProxy_Connect(t *testing.T) {
mock.Anything,
mock.Anything,
).Return(&milvuspb.ListDatabasesResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
DbNames: []string{"20230525"},
}, nil)
@ -765,9 +757,7 @@ func TestProxy_Connect(t *testing.T) {
mock.Anything,
mock.Anything,
).Return(&rootcoordpb.AllocTimestampResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
Timestamp: 20230518,
Count: 1,
}, nil)
@ -849,9 +839,7 @@ func TestProxyCreateDatabase(t *testing.T) {
t.Run("create database ok", func(t *testing.T) {
rc := mocks.NewRootCoord(t)
rc.On("CreateDatabase", mock.Anything, mock.Anything).
Return(&commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil)
Return(merr.Status(nil), nil)
node.rootCoord = rc
node.stateCode.Store(commonpb.StateCode_Healthy)
ctx := context.Background()
@ -905,9 +893,7 @@ func TestProxyDropDatabase(t *testing.T) {
t.Run("drop database ok", func(t *testing.T) {
rc := mocks.NewRootCoord(t)
rc.On("DropDatabase", mock.Anything, mock.Anything).
Return(&commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil)
Return(merr.Status(nil), nil)
node.rootCoord = rc
node.stateCode.Store(commonpb.StateCode_Healthy)
ctx := context.Background()
@ -962,9 +948,7 @@ func TestProxyListDatabase(t *testing.T) {
rc := mocks.NewRootCoord(t)
rc.On("ListDatabases", mock.Anything, mock.Anything).
Return(&milvuspb.ListDatabasesResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}}, nil)
Status: merr.Status(nil)}, nil)
node.rootCoord = rc
node.stateCode.Store(commonpb.StateCode_Healthy)
ctx := context.Background()

4
internal/proxy/lb_policy_test.go
View File

@ -84,9 +84,7 @@ func (s *LBPolicySuite) SetupTest() {
},
}, nil).Maybe()
qc.EXPECT().ShowPartitions(mock.Anything, mock.Anything).Return(&querypb.ShowPartitionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
PartitionIDs: []int64{1, 2, 3},
}, nil).Maybe()

88
internal/proxy/meta_cache_test.go
View File

@ -70,9 +70,7 @@ func (m *MockRootCoordClientInterface) ShowPartitions(ctx context.Context, in *m
}
if in.CollectionName == "collection1" {
return &milvuspb.ShowPartitionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
PartitionIDs: []typeutil.UniqueID{1, 2},
CreatedTimestamps: []uint64{100, 200},
CreatedUtcTimestamps: []uint64{100, 200},
@ -81,9 +79,7 @@ func (m *MockRootCoordClientInterface) ShowPartitions(ctx context.Context, in *m
}
if in.CollectionName == "collection2" {
return &milvuspb.ShowPartitionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
PartitionIDs: []typeutil.UniqueID{3, 4},
CreatedTimestamps: []uint64{201, 202},
CreatedUtcTimestamps: []uint64{201, 202},
@ -92,9 +88,7 @@ func (m *MockRootCoordClientInterface) ShowPartitions(ctx context.Context, in *m
}
if in.CollectionName == "errorCollection" {
return &milvuspb.ShowPartitionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
PartitionIDs: []typeutil.UniqueID{5, 6},
CreatedTimestamps: []uint64{201},
CreatedUtcTimestamps: []uint64{201},
@ -119,9 +113,7 @@ func (m *MockRootCoordClientInterface) DescribeCollection(ctx context.Context, i
m.IncAccessCount()
if in.CollectionName == "collection1" || in.CollectionID == 1 {
return &milvuspb.DescribeCollectionResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
CollectionID: typeutil.UniqueID(1),
Schema: &schemapb.CollectionSchema{
AutoID: true,
@ -132,9 +124,7 @@ func (m *MockRootCoordClientInterface) DescribeCollection(ctx context.Context, i
}
if in.CollectionName == "collection2" || in.CollectionID == 2 {
return &milvuspb.DescribeCollectionResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
CollectionID: typeutil.UniqueID(2),
Schema: &schemapb.CollectionSchema{
AutoID: true,
@ -145,9 +135,7 @@ func (m *MockRootCoordClientInterface) DescribeCollection(ctx context.Context, i
}
if in.CollectionName == "errorCollection" {
return &milvuspb.DescribeCollectionResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
CollectionID: typeutil.UniqueID(3),
Schema: &schemapb.CollectionSchema{
AutoID: true,
@ -171,9 +159,7 @@ func (m *MockRootCoordClientInterface) GetCredential(ctx context.Context, req *r
if req.Username == "mockUser" {
encryptedPassword, _ := crypto.PasswordEncrypt("mockPass")
return &rootcoordpb.GetCredentialResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
Username: "mockUser",
Password: encryptedPassword,
}, nil
@ -189,9 +175,7 @@ func (m *MockRootCoordClientInterface) ListCredUsers(ctx context.Context, req *m
}
return &milvuspb.ListCredUsersResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
Usernames: []string{"mockUser"},
}, nil
}
@ -201,9 +185,7 @@ func (m *MockRootCoordClientInterface) ListPolicy(ctx context.Context, in *inter
return m.listPolicy(ctx, in)
}
return &internalpb.ListPolicyResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
@ -536,9 +518,7 @@ func TestMetaCache_GetShards(t *testing.T) {
t.Run("without shardLeaders in collection info", func(t *testing.T) {
qc.EXPECT().GetShardLeaders(mock.Anything, mock.Anything).Return(&querypb.GetShardLeadersResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
Shards: []*querypb.ShardLeadersList{
{
ChannelName: "channel-1",
@ -600,9 +580,7 @@ func TestMetaCache_ClearShards(t *testing.T) {
t.Run("Clear valid collection valid cache", func(t *testing.T) {
qc.EXPECT().GetShardLeaders(mock.Anything, mock.Anything).Return(&querypb.GetShardLeadersResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
Shards: []*querypb.ShardLeadersList{
{
ChannelName: "channel-1",
@ -648,9 +626,7 @@ func TestMetaCache_PolicyInfo(t *testing.T) {
client.listPolicy = func(ctx context.Context, in *internalpb.ListPolicyRequest) (*internalpb.ListPolicyResponse, error) {
return &internalpb.ListPolicyResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
PolicyInfos: []string{"policy1", "policy2", "policy3"},
}, nil
}
@ -661,9 +637,7 @@ func TestMetaCache_PolicyInfo(t *testing.T) {
t.Run("GetPrivilegeInfo", func(t *testing.T) {
client.listPolicy = func(ctx context.Context, in *internalpb.ListPolicyRequest) (*internalpb.ListPolicyResponse, error) {
return &internalpb.ListPolicyResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
PolicyInfos: []string{"policy1", "policy2", "policy3"},
UserRoles: []string{funcutil.EncodeUserRoleCache("foo", "role1"), funcutil.EncodeUserRoleCache("foo", "role2"), funcutil.EncodeUserRoleCache("foo2", "role2")},
}, nil
@ -679,9 +653,7 @@ func TestMetaCache_PolicyInfo(t *testing.T) {
t.Run("GetPrivilegeInfo", func(t *testing.T) {
client.listPolicy = func(ctx context.Context, in *internalpb.ListPolicyRequest) (*internalpb.ListPolicyResponse, error) {
return &internalpb.ListPolicyResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
PolicyInfos: []string{"policy1", "policy2", "policy3"},
UserRoles: []string{funcutil.EncodeUserRoleCache("foo", "role1"), funcutil.EncodeUserRoleCache("foo", "role2"), funcutil.EncodeUserRoleCache("foo2", "role2")},
}, nil
@ -718,9 +690,7 @@ func TestMetaCache_PolicyInfo(t *testing.T) {
t.Run("Delete user or drop role", func(t *testing.T) {
client.listPolicy = func(ctx context.Context, in *internalpb.ListPolicyRequest) (*internalpb.ListPolicyResponse, error) {
return &internalpb.ListPolicyResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
PolicyInfos: []string{"policy1", "policy2", "policy3"},
UserRoles: []string{funcutil.EncodeUserRoleCache("foo", "role1"), funcutil.EncodeUserRoleCache("foo", "role2"), funcutil.EncodeUserRoleCache("foo2", "role2"), funcutil.EncodeUserRoleCache("foo2", "role3")},
}, nil
@ -745,9 +715,7 @@ func TestMetaCache_PolicyInfo(t *testing.T) {
client.listPolicy = func(ctx context.Context, in *internalpb.ListPolicyRequest) (*internalpb.ListPolicyResponse, error) {
return &internalpb.ListPolicyResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
PolicyInfos: []string{"policy1", "policy2", "policy3"},
UserRoles: []string{funcutil.EncodeUserRoleCache("foo", "role1"), funcutil.EncodeUserRoleCache("foo", "role2"), funcutil.EncodeUserRoleCache("foo2", "role2"), funcutil.EncodeUserRoleCache("foo2", "role3")},
}, nil
@ -768,9 +736,7 @@ func TestMetaCache_RemoveCollection(t *testing.T) {
assert.NoError(t, err)
queryCoord.EXPECT().ShowCollections(mock.Anything, mock.Anything).Return(&querypb.ShowCollectionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
CollectionIDs: []UniqueID{1, 2},
InMemoryPercentages: []int64{100, 50},
}, nil)
@ -819,16 +785,12 @@ func TestMetaCache_ExpireShardLeaderCache(t *testing.T) {
assert.NoError(t, err)
queryCoord.EXPECT().ShowCollections(mock.Anything, mock.Anything).Return(&querypb.ShowCollectionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
CollectionIDs: []UniqueID{1},
InMemoryPercentages: []int64{100},
}, nil)
queryCoord.EXPECT().GetShardLeaders(mock.Anything, mock.Anything).Return(&querypb.GetShardLeadersResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
Shards: []*querypb.ShardLeadersList{
{
ChannelName: "channel-1",
@ -843,9 +805,7 @@ func TestMetaCache_ExpireShardLeaderCache(t *testing.T) {
queryCoord.ExpectedCalls = nil
queryCoord.EXPECT().GetShardLeaders(mock.Anything, mock.Anything).Return(&querypb.GetShardLeadersResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
Shards: []*querypb.ShardLeadersList{
{
ChannelName: "channel-1",
@ -863,9 +823,7 @@ func TestMetaCache_ExpireShardLeaderCache(t *testing.T) {
queryCoord.ExpectedCalls = nil
queryCoord.EXPECT().GetShardLeaders(mock.Anything, mock.Anything).Return(&querypb.GetShardLeadersResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
Shards: []*querypb.ShardLeadersList{
{
ChannelName: "channel-1",
@ -883,9 +841,7 @@ func TestMetaCache_ExpireShardLeaderCache(t *testing.T) {
queryCoord.ExpectedCalls = nil
queryCoord.EXPECT().GetShardLeaders(mock.Anything, mock.Anything).Return(&querypb.GetShardLeadersResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
Shards: []*querypb.ShardLeadersList{
{
ChannelName: "channel-1",

17
internal/proxy/metrics_info_test.go
View File

@ -22,9 +22,9 @@ import (
"github.com/milvus-io/milvus/internal/util/sessionutil"
"github.com/milvus-io/milvus/pkg/util/funcutil"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/uniquegenerator"
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
"github.com/milvus-io/milvus-proto/go-api/v2/milvuspb"
"github.com/milvus-io/milvus/pkg/util/typeutil"
@ -90,10 +90,7 @@ func TestProxy_metrics(t *testing.T) {
resp, _ := metricsinfo.MarshalTopology(rootCoordTopology)
return &milvuspb.GetMetricsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
Response: resp,
ComponentName: metricsinfo.ConstructComponentName(typeutil.RootCoordRole, id),
}, nil
@ -142,10 +139,7 @@ func TestProxy_metrics(t *testing.T) {
resp, _ := metricsinfo.MarshalTopology(coordTopology)
return &milvuspb.GetMetricsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
Response: resp,
ComponentName: metricsinfo.ConstructComponentName(typeutil.QueryCoordRole, id),
}, nil
@ -202,10 +196,7 @@ func TestProxy_metrics(t *testing.T) {
resp, _ := metricsinfo.MarshalTopology(coordTopology)
return &milvuspb.GetMetricsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
Response: resp,
ComponentName: metricsinfo.ConstructComponentName(typeutil.DataCoordRole, id),
}, nil

6
internal/proxy/mock_test.go
View File

@ -29,6 +29,7 @@ import (
"github.com/milvus-io/milvus/pkg/mq/msgstream"
"github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper"
"github.com/milvus-io/milvus/pkg/util/funcutil"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/paramtable"
"github.com/milvus-io/milvus/pkg/util/uniquegenerator"
)
@ -49,10 +50,7 @@ func (tso *mockTimestampAllocatorInterface) AllocTimestamp(ctx context.Context,
tso.lastTs = ts
return &rootcoordpb.AllocTimestampResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
Timestamp: ts,
Count: req.Count,
}, nil

9
internal/proxy/privilege_interceptor_test.go
View File

@ -10,6 +10,7 @@ import (
"github.com/milvus-io/milvus/internal/mocks"
"github.com/milvus-io/milvus/internal/proto/internalpb"
"github.com/milvus-io/milvus/pkg/util/funcutil"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/paramtable"
"github.com/stretchr/testify/assert"
)
@ -50,9 +51,7 @@ func TestPrivilegeInterceptor(t *testing.T) {
client.listPolicy = func(ctx context.Context, in *internalpb.ListPolicyRequest) (*internalpb.ListPolicyResponse, error) {
return &internalpb.ListPolicyResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
PolicyInfos: []string{
funcutil.PolicyForPrivilege("role1", commonpb.ObjectType_Collection.String(), "col1", commonpb.ObjectPrivilege_PrivilegeLoad.String(), "default"),
funcutil.PolicyForPrivilege("role1", commonpb.ObjectType_Collection.String(), "col1", commonpb.ObjectPrivilege_PrivilegeGetLoadState.String(), "default"),
@ -181,9 +180,7 @@ func TestResourceGroupPrivilege(t *testing.T) {
client.listPolicy = func(ctx context.Context, in *internalpb.ListPolicyRequest) (*internalpb.ListPolicyResponse, error) {
return &internalpb.ListPolicyResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
PolicyInfos: []string{
funcutil.PolicyForPrivilege("role1", commonpb.ObjectType_Global.String(), "*", commonpb.ObjectPrivilege_PrivilegeCreateResourceGroup.String(), "default"),
funcutil.PolicyForPrivilege("role1", commonpb.ObjectType_Global.String(), "*", commonpb.ObjectPrivilege_PrivilegeDropResourceGroup.String(), "default"),

30
internal/proxy/proxy_test.go
View File

@ -4261,10 +4261,7 @@ func TestProxy_GetLoadState(t *testing.T) {
ExtraInfo: nil,
},
SubcomponentStates: nil,
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
}, nil)
qc.EXPECT().ShowCollections(mock.Anything, mock.Anything).Return(&querypb.ShowCollectionsResponse{
Status: &commonpb.Status{ErrorCode: commonpb.ErrorCode_Success},
@ -4292,10 +4289,7 @@ func TestProxy_GetLoadState(t *testing.T) {
ExtraInfo: nil,
},
SubcomponentStates: nil,
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
}, nil)
qc.EXPECT().ShowCollections(mock.Anything, mock.Anything).Return(nil, errors.New("test"))
qc.EXPECT().ShowPartitions(mock.Anything, mock.Anything).Return(nil, errors.New("test"))
@ -4333,10 +4327,7 @@ func TestProxy_GetLoadState(t *testing.T) {
ExtraInfo: nil,
},
SubcomponentStates: nil,
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
}, nil)
qc.EXPECT().ShowCollections(mock.Anything, mock.Anything).Return(&querypb.ShowCollectionsResponse{
Status: &commonpb.Status{ErrorCode: commonpb.ErrorCode_Success},
@ -4367,10 +4358,7 @@ func TestProxy_GetLoadState(t *testing.T) {
ExtraInfo: nil,
},
SubcomponentStates: nil,
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
}, nil)
qc.EXPECT().ShowCollections(mock.Anything, mock.Anything).Return(&querypb.ShowCollectionsResponse{
Status: &commonpb.Status{ErrorCode: commonpb.ErrorCode_Success},
@ -4405,10 +4393,7 @@ func TestProxy_GetLoadState(t *testing.T) {
ExtraInfo: nil,
},
SubcomponentStates: nil,
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
}, nil)
qc.EXPECT().ShowCollections(mock.Anything, mock.Anything).Return(&querypb.ShowCollectionsResponse{
Status: &commonpb.Status{ErrorCode: commonpb.ErrorCode_Success},
@ -4439,10 +4424,7 @@ func TestProxy_GetLoadState(t *testing.T) {
ExtraInfo: nil,
},
SubcomponentStates: nil,
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
}, nil)
qc.EXPECT().ShowCollections(mock.Anything, mock.Anything).Return(&querypb.ShowCollectionsResponse{
Status: &commonpb.Status{ErrorCode: commonpb.ErrorCode_InsufficientMemoryToLoad},

4
internal/proxy/rate_limit_interceptor_test.go
View File

@ -199,9 +199,7 @@ func TestRateLimitInterceptor(t *testing.T) {
limiter := limiterMock{rate: 100}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
serverInfo := &grpc.UnaryServerInfo{FullMethod: "MockFullMethod"}

147
internal/proxy/rootcoord_mock_test.go
View File

@ -36,6 +36,7 @@ import (
"github.com/milvus-io/milvus/internal/types"
"github.com/milvus-io/milvus/pkg/common"
"github.com/milvus-io/milvus/pkg/util/funcutil"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/milvuserrors"
"github.com/milvus-io/milvus/pkg/util/typeutil"
"github.com/milvus-io/milvus/pkg/util/uniquegenerator"
@ -134,10 +135,7 @@ func (coord *RootCoordMock) CreateAlias(ctx context.Context, req *milvuspb.Creat
}
coord.collAlias2ID[req.Alias] = collID
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, nil
return merr.Status(nil), nil
}
func (coord *RootCoordMock) DropAlias(ctx context.Context, req *milvuspb.DropAliasRequest) (*commonpb.Status, error) {
@ -160,10 +158,7 @@ func (coord *RootCoordMock) DropAlias(ctx context.Context, req *milvuspb.DropAli
}
delete(coord.collAlias2ID, req.Alias)
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, nil
return merr.Status(nil), nil
}
func (coord *RootCoordMock) AlterAlias(ctx context.Context, req *milvuspb.AlterAliasRequest) (*commonpb.Status, error) {
@ -192,10 +187,7 @@ func (coord *RootCoordMock) AlterAlias(ctx context.Context, req *milvuspb.AlterA
}, nil
}
coord.collAlias2ID[req.Alias] = collID
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, nil
return merr.Status(nil), nil
}
func (coord *RootCoordMock) updateState(state commonpb.StateCode) {
@ -236,10 +228,7 @@ func (coord *RootCoordMock) GetComponentStates(ctx context.Context) (*milvuspb.C
ExtraInfo: nil,
},
SubcomponentStates: nil,
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
}, nil
}
@ -254,11 +243,8 @@ func (coord *RootCoordMock) GetStatisticsChannel(ctx context.Context) (*milvuspb
}, nil
}
return &milvuspb.StringResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Value: coord.statisticsChannel,
Status: merr.Status(nil),
Value: coord.statisticsChannel,
}, nil
}
@ -277,11 +263,8 @@ func (coord *RootCoordMock) GetTimeTickChannel(ctx context.Context) (*milvuspb.S
}, nil
}
return &milvuspb.StringResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Value: coord.timeTickChannel,
Status: merr.Status(nil),
Value: coord.timeTickChannel,
}, nil
}
@ -384,10 +367,7 @@ func (coord *RootCoordMock) CreateCollection(ctx context.Context, req *milvuspb.
coord.collID2Partitions[collID].partitionID2Meta[id] = partitionMeta{}
}
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, nil
return merr.Status(nil), nil
}
func (coord *RootCoordMock) DropCollection(ctx context.Context, req *milvuspb.DropCollectionRequest) (*commonpb.Status, error) {
@ -418,10 +398,7 @@ func (coord *RootCoordMock) DropCollection(ctx context.Context, req *milvuspb.Dr
delete(coord.collID2Partitions, collID)
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, nil
return merr.Status(nil), nil
}
func (coord *RootCoordMock) HasCollection(ctx context.Context, req *milvuspb.HasCollectionRequest) (*milvuspb.BoolResponse, error) {
@ -441,11 +418,8 @@ func (coord *RootCoordMock) HasCollection(ctx context.Context, req *milvuspb.Has
_, exist := coord.collName2ID[req.CollectionName]
return &milvuspb.BoolResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Value: exist,
Status: merr.Status(nil),
Value: exist,
}, nil
}
@ -503,10 +477,7 @@ func (coord *RootCoordMock) DescribeCollection(ctx context.Context, req *milvusp
}
return &milvuspb.DescribeCollectionResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
Schema: meta.schema,
CollectionID: collID,
ShardsNum: meta.shardsNum,
@ -550,10 +521,7 @@ func (coord *RootCoordMock) ShowCollections(ctx context.Context, req *milvuspb.S
}
return &milvuspb.ShowCollectionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
CollectionNames: names,
CollectionIds: ids,
CreatedTimestamps: createdTimestamps,
@ -602,10 +570,7 @@ func (coord *RootCoordMock) CreatePartition(ctx context.Context, req *milvuspb.C
createdUtcTimestamp: ts,
}
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, nil
return merr.Status(nil), nil
}
func (coord *RootCoordMock) DropPartition(ctx context.Context, req *milvuspb.DropPartitionRequest) (*commonpb.Status, error) {
@ -641,10 +606,7 @@ func (coord *RootCoordMock) DropPartition(ctx context.Context, req *milvuspb.Dro
delete(coord.collID2Partitions[collID].partitionName2ID, req.PartitionName)
delete(coord.collID2Partitions[collID].partitionID2Name, partitionID)
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, nil
return merr.Status(nil), nil
}
func (coord *RootCoordMock) HasPartition(ctx context.Context, req *milvuspb.HasPartitionRequest) (*milvuspb.BoolResponse, error) {
@ -677,11 +639,8 @@ func (coord *RootCoordMock) HasPartition(ctx context.Context, req *milvuspb.HasP
_, partitionExist := coord.collID2Partitions[collID].partitionName2ID[req.PartitionName]
return &milvuspb.BoolResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Value: partitionExist,
Status: merr.Status(nil),
Value: partitionExist,
}, nil
}
@ -734,10 +693,7 @@ func (coord *RootCoordMock) ShowPartitions(ctx context.Context, req *milvuspb.Sh
}
return &milvuspb.ShowPartitionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
PartitionNames: names,
PartitionIDs: ids,
CreatedTimestamps: createdTimestamps,
@ -838,10 +794,7 @@ func (coord *RootCoordMock) AllocTimestamp(ctx context.Context, req *rootcoordpb
coord.lastTs = ts
return &rootcoordpb.AllocTimestampResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
Timestamp: ts,
Count: req.Count,
}, nil
@ -861,12 +814,9 @@ func (coord *RootCoordMock) AllocID(ctx context.Context, req *rootcoordpb.AllocI
}
begin, _ := uniquegenerator.GetUniqueIntGeneratorIns().GetInts(int(req.Count))
return &rootcoordpb.AllocIDResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
ID: int64(begin),
Count: req.Count,
Status: merr.Status(nil),
ID: int64(begin),
Count: req.Count,
}, nil
}
@ -878,10 +828,7 @@ func (coord *RootCoordMock) UpdateChannelTimeTick(ctx context.Context, req *inte
Reason: fmt.Sprintf("state code = %s", commonpb.StateCode_name[int32(code)]),
}, nil
}
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, nil
return merr.Status(nil), nil
}
func (coord *RootCoordMock) DescribeSegment(ctx context.Context, req *milvuspb.DescribeSegmentRequest) (*milvuspb.DescribeSegmentResponse, error) {
@ -896,10 +843,7 @@ func (coord *RootCoordMock) DescribeSegment(ctx context.Context, req *milvuspb.D
}, nil
}
return &milvuspb.DescribeSegmentResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
IndexID: 0,
BuildID: 0,
EnableIndex: false,
@ -918,10 +862,7 @@ func (coord *RootCoordMock) ShowSegments(ctx context.Context, req *milvuspb.Show
}, nil
}
return &milvuspb.ShowSegmentsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
SegmentIDs: nil,
}, nil
}
@ -938,10 +879,7 @@ func (coord *RootCoordMock) InvalidateCollectionMetaCache(ctx context.Context, i
Reason: fmt.Sprintf("state code = %s", commonpb.StateCode_name[int32(code)]),
}, nil
}
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, nil
return merr.Status(nil), nil
}
func (coord *RootCoordMock) SegmentFlushCompleted(ctx context.Context, in *datapb.SegmentFlushCompletedMsg) (*commonpb.Status, error) {
@ -952,10 +890,7 @@ func (coord *RootCoordMock) SegmentFlushCompleted(ctx context.Context, in *datap
Reason: fmt.Sprintf("state code = %s", commonpb.StateCode_name[int32(code)]),
}, nil
}
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, nil
return merr.Status(nil), nil
}
func (coord *RootCoordMock) ShowConfigurations(ctx context.Context, req *internalpb.ShowConfigurationsRequest) (*internalpb.ShowConfigurationsResponse, error) {
@ -1016,11 +951,8 @@ func (coord *RootCoordMock) Import(ctx context.Context, req *milvuspb.ImportRequ
}, nil
}
return &milvuspb.ImportResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Tasks: make([]int64, 3),
Status: merr.Status(nil),
Tasks: make([]int64, 3),
}, nil
}
@ -1037,10 +969,7 @@ func (coord *RootCoordMock) GetImportState(ctx context.Context, req *milvuspb.Ge
}, nil
}
return &milvuspb.GetImportStateResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
RowCount: 10,
IdList: make([]int64, 3),
}, nil
@ -1058,11 +987,8 @@ func (coord *RootCoordMock) ListImportTasks(ctx context.Context, in *milvuspb.Li
}, nil
}
return &milvuspb.ListImportTasksResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Tasks: make([]*milvuspb.GetImportStateResponse, 3),
Status: merr.Status(nil),
Tasks: make([]*milvuspb.GetImportStateResponse, 3),
}, nil
}
@ -1074,10 +1000,7 @@ func (coord *RootCoordMock) ReportImport(ctx context.Context, req *rootcoordpb.I
Reason: fmt.Sprintf("state code = %s", commonpb.StateCode_name[int32(code)]),
}, nil
}
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, nil
return merr.Status(nil), nil
}
func NewRootCoordMock(opts ...RootCoordMockOption) *RootCoordMock {

14
internal/proxy/segment_test.go
View File

@ -28,6 +28,7 @@ import (
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
"github.com/milvus-io/milvus/internal/proto/datapb"
"github.com/milvus-io/milvus/pkg/util/merr"
)
type mockDataCoord struct {
@ -53,19 +54,14 @@ func (mockD *mockDataCoord) AssignSegmentID(ctx context.Context, req *datapb.Ass
PartitionID: r.PartitionID,
ExpireTime: mockD.expireTime,
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
}
assigns = append(assigns, result)
}
}
return &datapb.AssignSegmentIDResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
SegIDAssignments: assigns,
}, nil
}
@ -214,9 +210,7 @@ func (mockD *mockDataCoord3) AssignSegmentID(ctx context.Context, req *datapb.As
}
return &datapb.AssignSegmentIDResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
SegIDAssignments: assigns,
}, nil
}

17
internal/proxy/task_delete_test.go
View File

@ -10,7 +10,6 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
"github.com/milvus-io/milvus-proto/go-api/v2/milvuspb"
"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
"github.com/milvus-io/milvus/internal/allocator"
@ -387,9 +386,7 @@ func TestDeleteTask_Execute(t *testing.T) {
vChannels: channels,
lb: lb,
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
IDs: &schemapb.IDs{
IdField: nil,
},
@ -439,9 +436,7 @@ func TestDeleteTask_Execute(t *testing.T) {
idAllocator: allocator,
lb: lb,
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
IDs: &schemapb.IDs{
IdField: nil,
},
@ -514,9 +509,7 @@ func TestDeleteTask_Execute(t *testing.T) {
idAllocator: allocator,
lb: lb,
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
IDs: &schemapb.IDs{
IdField: nil,
},
@ -585,9 +578,7 @@ func TestDeleteTask_Execute(t *testing.T) {
idAllocator: allocator,
lb: lb,
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
IDs: &schemapb.IDs{
IdField: nil,
},

20
internal/proxy/task_index_test.go
View File

@ -56,9 +56,7 @@ func TestGetIndexStateTask_Execute(t *testing.T) {
rootCoord := newMockRootCoord()
queryCoord := getMockQueryCoord()
queryCoord.EXPECT().ShowCollections(mock.Anything, mock.Anything).Return(&querypb.ShowCollectionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
CollectionIDs: []int64{},
}, nil)
datacoord := NewDataCoordMock()
@ -88,9 +86,7 @@ func TestGetIndexStateTask_Execute(t *testing.T) {
rootCoord.DescribeCollectionFunc = func(ctx context.Context, request *milvuspb.DescribeCollectionRequest) (*milvuspb.DescribeCollectionResponse, error) {
return &milvuspb.DescribeCollectionResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
Schema: newTestSchema(),
CollectionID: collectionID,
CollectionName: request.CollectionName,
@ -99,9 +95,7 @@ func TestGetIndexStateTask_Execute(t *testing.T) {
datacoord.GetIndexStateFunc = func(ctx context.Context, request *indexpb.GetIndexStateRequest) (*indexpb.GetIndexStateResponse, error) {
return &indexpb.GetIndexStateResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
State: commonpb.IndexState_Finished,
FailReason: "",
}, nil
@ -120,9 +114,7 @@ func TestDropIndexTask_PreExecute(t *testing.T) {
paramtable.Init()
qc := getMockQueryCoord()
qc.EXPECT().ShowCollections(mock.Anything, mock.Anything).Return(&querypb.ShowCollectionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
CollectionIDs: []int64{},
}, nil)
dc := NewDataCoordMock()
@ -183,9 +175,7 @@ func TestDropIndexTask_PreExecute(t *testing.T) {
t.Run("coll has been loaded", func(t *testing.T) {
qc := getMockQueryCoord()
qc.EXPECT().ShowCollections(mock.Anything, mock.Anything).Return(&querypb.ShowCollectionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
CollectionIDs: []int64{collectionID},
}, nil)
dit.queryCoord = qc

11
internal/proxy/task_query_test.go
View File

@ -38,6 +38,7 @@ import (
"github.com/milvus-io/milvus/pkg/common"
"github.com/milvus-io/milvus/pkg/log"
"github.com/milvus-io/milvus/pkg/util/funcutil"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/paramtable"
"github.com/milvus-io/milvus/pkg/util/typeutil"
)
@ -146,9 +147,7 @@ func TestQueryTask_all(t *testing.T) {
},
ctx: ctx,
result: &milvuspb.QueryResults{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
FieldsData: []*schemapb.FieldData{},
},
request: &milvuspb.QueryRequest{
@ -190,10 +189,8 @@ func TestQueryTask_all(t *testing.T) {
assert.Error(t, task.PreExecute(ctx))
result1 := &internalpb.RetrieveResults{
Base: &commonpb.MsgBase{MsgType: commonpb.MsgType_RetrieveResult},
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Base: &commonpb.MsgBase{MsgType: commonpb.MsgType_RetrieveResult},
Status: merr.Status(nil),
Ids: &schemapb.IDs{
IdField: &schemapb.IDs_IntId{
IntId: &schemapb.LongArray{Data: generateInt64Array(hitNum)},

9
internal/proxy/task_search_test.go
View File

@ -38,6 +38,7 @@ import (
"github.com/milvus-io/milvus/internal/types"
"github.com/milvus-io/milvus/pkg/common"
"github.com/milvus-io/milvus/pkg/util/funcutil"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/metric"
"github.com/milvus-io/milvus/pkg/util/paramtable"
"github.com/milvus-io/milvus/pkg/util/timerecord"
@ -1646,9 +1647,7 @@ func TestSearchTask_ErrExecute(t *testing.T) {
},
ctx: ctx,
result: &milvuspb.SearchResults{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
},
request: &milvuspb.SearchRequest{
Base: &commonpb.MsgBase{
@ -1695,9 +1694,7 @@ func TestSearchTask_ErrExecute(t *testing.T) {
qn.ExpectedCalls = nil
qn.EXPECT().GetComponentStates(mock.Anything).Return(nil, nil).Maybe()
qn.EXPECT().Search(mock.Anything, mock.Anything).Return(&internalpb.SearchResults{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil)
assert.NoError(t, task.Execute(ctx))
}

9
internal/proxy/task_statistic_test.go
View File

@ -32,6 +32,7 @@ import (
"github.com/milvus-io/milvus/internal/proto/querypb"
"github.com/milvus-io/milvus/internal/types"
"github.com/milvus-io/milvus/pkg/common"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/paramtable"
"github.com/milvus-io/milvus/pkg/util/typeutil"
)
@ -68,9 +69,7 @@ func (s *StatisticTaskSuite) SetupTest() {
},
}, nil).Maybe()
qc.EXPECT().ShowPartitions(mock.Anything, mock.Anything).Return(&querypb.ShowPartitionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
PartitionIDs: []int64{1, 2, 3},
}, nil).Maybe()
@ -168,9 +167,7 @@ func (s *StatisticTaskSuite) getStatisticsTask(ctx context.Context) *getStatisti
ctx: ctx,
collectionName: s.collectionName,
result: &milvuspb.GetStatisticsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
},
request: &milvuspb.GetStatisticsRequest{
Base: &commonpb.MsgBase{

93
internal/proxy/task_test.go
View File

@ -1285,10 +1285,7 @@ func TestDropPartitionTask(t *testing.T) {
partitionName := prefix + funcutil.GenRandomStr()
qc := getQueryCoord()
qc.EXPECT().ShowPartitions(mock.Anything, mock.Anything).Return(&querypb.ShowPartitionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
PartitionIDs: []int64{},
}, nil)
qc.EXPECT().ShowCollections(mock.Anything, mock.Anything).Return(&querypb.ShowCollectionsResponse{
@ -1650,10 +1647,7 @@ func TestTask_Int64PrimaryKey(t *testing.T) {
Condition: NewTaskCondition(ctx),
ctx: ctx,
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
IDs: nil,
SuccIndex: nil,
ErrIndex: nil,
@ -1693,10 +1687,7 @@ func TestTask_Int64PrimaryKey(t *testing.T) {
idAllocator: idAllocator,
ctx: ctx,
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
IDs: nil,
SuccIndex: nil,
ErrIndex: nil,
@ -1741,10 +1732,7 @@ func TestTask_Int64PrimaryKey(t *testing.T) {
idAllocator: idAllocator,
ctx: ctx,
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
IDs: nil,
SuccIndex: nil,
ErrIndex: nil,
@ -1905,10 +1893,7 @@ func TestTask_VarCharPrimaryKey(t *testing.T) {
Condition: NewTaskCondition(ctx),
ctx: ctx,
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
IDs: nil,
SuccIndex: nil,
ErrIndex: nil,
@ -1993,10 +1978,7 @@ func TestTask_VarCharPrimaryKey(t *testing.T) {
},
ctx: ctx,
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
IDs: nil,
SuccIndex: nil,
ErrIndex: nil,
@ -2038,10 +2020,7 @@ func TestTask_VarCharPrimaryKey(t *testing.T) {
idAllocator: idAllocator,
ctx: ctx,
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
IDs: nil,
SuccIndex: nil,
ErrIndex: nil,
@ -2088,10 +2067,8 @@ func TestCreateAlias_all(t *testing.T) {
CollectionName: collectionName,
Alias: "alias1",
},
ctx: ctx,
result: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
ctx: ctx,
result: merr.Status(nil),
rootCoord: rc,
}
@ -2126,10 +2103,8 @@ func TestDropAlias_all(t *testing.T) {
Base: nil,
Alias: "alias1",
},
ctx: ctx,
result: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
ctx: ctx,
result: merr.Status(nil),
rootCoord: rc,
}
@ -2167,10 +2142,8 @@ func TestAlterAlias_all(t *testing.T) {
CollectionName: collectionName,
Alias: "alias1",
},
ctx: ctx,
result: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
ctx: ctx,
result: merr.Status(nil),
rootCoord: rc,
}
@ -2558,10 +2531,7 @@ func Test_loadCollectionTask_Execute(t *testing.T) {
qc := getQueryCoord()
qc.EXPECT().ShowPartitions(mock.Anything, mock.Anything).Return(&querypb.ShowPartitionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
PartitionIDs: []int64{},
}, nil)
qc.EXPECT().ShowCollections(mock.Anything, mock.Anything).Return(&querypb.ShowCollectionsResponse{
@ -2582,9 +2552,7 @@ func Test_loadCollectionTask_Execute(t *testing.T) {
rc.DescribeCollectionFunc = func(ctx context.Context, request *milvuspb.DescribeCollectionRequest) (*milvuspb.DescribeCollectionResponse, error) {
return &milvuspb.DescribeCollectionResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
Schema: newTestSchema(),
CollectionID: collectionID,
CollectionName: request.CollectionName,
@ -2633,9 +2601,7 @@ func Test_loadCollectionTask_Execute(t *testing.T) {
t.Run("no vector index", func(t *testing.T) {
dc.DescribeIndexFunc = func(ctx context.Context, request *indexpb.DescribeIndexRequest) (*indexpb.DescribeIndexResponse, error) {
return &indexpb.DescribeIndexResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
IndexInfos: []*indexpb.IndexInfo{
{
CollectionID: collectionID,
@ -2666,10 +2632,7 @@ func Test_loadPartitionTask_Execute(t *testing.T) {
qc := getQueryCoord()
qc.EXPECT().ShowPartitions(mock.Anything, mock.Anything).Return(&querypb.ShowPartitionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
PartitionIDs: []int64{},
}, nil)
qc.EXPECT().ShowCollections(mock.Anything, mock.Anything).Return(&querypb.ShowCollectionsResponse{
@ -2690,9 +2653,7 @@ func Test_loadPartitionTask_Execute(t *testing.T) {
rc.DescribeCollectionFunc = func(ctx context.Context, request *milvuspb.DescribeCollectionRequest) (*milvuspb.DescribeCollectionResponse, error) {
return &milvuspb.DescribeCollectionResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
Schema: newTestSchema(),
CollectionID: collectionID,
CollectionName: request.CollectionName,
@ -2741,9 +2702,7 @@ func Test_loadPartitionTask_Execute(t *testing.T) {
t.Run("no vector index", func(t *testing.T) {
dc.DescribeIndexFunc = func(ctx context.Context, request *indexpb.DescribeIndexRequest) (*indexpb.DescribeIndexResponse, error) {
return &indexpb.DescribeIndexResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
IndexInfos: []*indexpb.IndexInfo{
{
CollectionID: collectionID,
@ -3421,10 +3380,7 @@ func TestPartitionKey(t *testing.T) {
Condition: NewTaskCondition(ctx),
ctx: ctx,
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
IDs: nil,
SuccIndex: nil,
ErrIndex: nil,
@ -3473,9 +3429,7 @@ func TestPartitionKey(t *testing.T) {
},
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
IDs: &schemapb.IDs{
IdField: nil,
},
@ -3506,10 +3460,7 @@ func TestPartitionKey(t *testing.T) {
},
ctx: ctx,
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
IDs: nil,
SuccIndex: nil,
ErrIndex: nil,

50
internal/proxy/util_test.go
View File

@ -1041,10 +1041,7 @@ func Test_isPartitionIsLoaded(t *testing.T) {
},
}, nil)
qc.EXPECT().ShowPartitions(mock.Anything, mock.Anything).Return(&querypb.ShowPartitionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
PartitionIDs: []int64{partID},
}, nil)
loaded, err := isPartitionLoaded(ctx, qc, collID, []int64{partID})
@ -1069,10 +1066,7 @@ func Test_isPartitionIsLoaded(t *testing.T) {
},
}, nil)
qc.EXPECT().ShowPartitions(mock.Anything, mock.Anything).Return(&querypb.ShowPartitionsResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
Status: merr.Status(nil),
PartitionIDs: []int64{partID},
}, errors.New("error"))
loaded, err := isPartitionLoaded(ctx, qc, collID, []int64{partID})
@ -1410,9 +1404,7 @@ func Test_InsertTaskCheckPrimaryFieldData(t *testing.T) {
},
},
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
},
}
@ -1454,9 +1446,7 @@ func Test_InsertTaskCheckPrimaryFieldData(t *testing.T) {
},
},
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
},
}
_, err = checkPrimaryFieldData(case2.schema, case2.result, case2.insertMsg, true)
@ -1496,9 +1486,7 @@ func Test_InsertTaskCheckPrimaryFieldData(t *testing.T) {
},
},
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
},
}
_, err = checkPrimaryFieldData(case3.schema, case3.result, case3.insertMsg, true)
@ -1542,9 +1530,7 @@ func Test_InsertTaskCheckPrimaryFieldData(t *testing.T) {
},
},
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
},
}
case4.schema.Fields[0].IsPrimaryKey = true
@ -1583,9 +1569,7 @@ func Test_UpsertTaskCheckPrimaryFieldData(t *testing.T) {
},
},
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
},
}
_, err := checkPrimaryFieldData(case1.schema, case1.result, case1.insertMsg, false)
@ -1628,9 +1612,7 @@ func Test_UpsertTaskCheckPrimaryFieldData(t *testing.T) {
},
},
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
},
}
_, err = checkPrimaryFieldData(case2.schema, case2.result, case2.insertMsg, false)
@ -1670,9 +1652,7 @@ func Test_UpsertTaskCheckPrimaryFieldData(t *testing.T) {
},
},
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
},
}
_, err = checkPrimaryFieldData(case3.schema, case3.result, case3.insertMsg, false)
@ -1715,9 +1695,7 @@ func Test_UpsertTaskCheckPrimaryFieldData(t *testing.T) {
},
},
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
},
}
case4.schema.Fields[0].IsPrimaryKey = true
@ -1761,9 +1739,7 @@ func Test_UpsertTaskCheckPrimaryFieldData(t *testing.T) {
},
},
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
},
}
case5.schema.Fields[0].IsPrimaryKey = true
@ -1812,9 +1788,7 @@ func Test_UpsertTaskCheckPrimaryFieldData(t *testing.T) {
},
},
result: &milvuspb.MutationResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
},
}
case6.schema.Fields[0].IsPrimaryKey = true

6
internal/querycoordv2/observers/collection_observer_test.go
View File

@ -26,7 +26,6 @@ import (
"github.com/stretchr/testify/suite"
clientv3 "go.etcd.io/etcd/client/v3"
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
"github.com/milvus-io/milvus/internal/kv"
etcdkv "github.com/milvus-io/milvus/internal/kv/etcd"
"github.com/milvus-io/milvus/internal/metastore"
@ -39,6 +38,7 @@ import (
"github.com/milvus-io/milvus/internal/querycoordv2/session"
"github.com/milvus-io/milvus/pkg/log"
"github.com/milvus-io/milvus/pkg/util/etcd"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/paramtable"
)
@ -198,9 +198,7 @@ func (suite *CollectionObserverSuite) SetupTest() {
mockCluster := session.NewMockCluster(suite.T())
suite.leaderObserver = NewLeaderObserver(suite.dist, suite.meta, suite.targetMgr, suite.broker, mockCluster)
mockCluster.EXPECT().SyncDistribution(mock.Anything, mock.Anything, mock.Anything).Return(&commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil).Maybe()
mockCluster.EXPECT().SyncDistribution(mock.Anything, mock.Anything, mock.Anything).Return(merr.Status(nil), nil).Maybe()
// Test object
suite.ob = NewCollectionObserver(

4
internal/querycoordv2/server_test.go
View File

@ -443,9 +443,7 @@ func (suite *ServerSuite) expectGetRecoverInfoByMockDataCoord(collection int64,
}
}
dataCoord.EXPECT().GetRecoveryInfoV2(mock.Anything, getRecoveryInfoRequest).Return(&datapb.GetRecoveryInfoResponseV2{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
Channels: vChannels,
Segments: segmentInfos,
}, nil).Maybe()

51
internal/querycoordv2/session/cluster_test.go
View File

@ -27,6 +27,7 @@ import (
"github.com/milvus-io/milvus-proto/go-api/v2/milvuspb"
"github.com/milvus-io/milvus/internal/proto/querypb"
"github.com/milvus-io/milvus/internal/querycoordv2/mocks"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/paramtable"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/suite"
@ -106,10 +107,7 @@ func (suite *ClusterTestSuite) createTestServers() []querypb.QueryNodeServer {
}
func (suite *ClusterTestSuite) createDefaultMockServer() querypb.QueryNodeServer {
succStatus := &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}
succStatus := merr.Status(nil)
svr := mocks.NewMockQueryNodeServer(suite.T())
// TODO: register more mock methods
svr.EXPECT().LoadSegments(
@ -218,10 +216,7 @@ func (suite *ClusterTestSuite) TestLoadSegments() {
Infos: []*querypb.SegmentLoadInfo{{}},
})
suite.NoError(err)
suite.Equal(&commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, status)
suite.Equal(merr.Status(nil), status)
status, err = suite.cluster.LoadSegments(ctx, 1, &querypb.LoadSegmentsRequest{
Base: &commonpb.MsgBase{},
@ -247,10 +242,7 @@ func (suite *ClusterTestSuite) TestWatchDmChannels() {
Base: &commonpb.MsgBase{},
})
suite.NoError(err)
suite.Equal(&commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, status)
suite.Equal(merr.Status(nil), status)
status, err = suite.cluster.WatchDmChannels(ctx, 1, &querypb.WatchDmChannelsRequest{
Base: &commonpb.MsgBase{},
@ -268,10 +260,7 @@ func (suite *ClusterTestSuite) TestUnsubDmChannel() {
Base: &commonpb.MsgBase{},
})
suite.NoError(err)
suite.Equal(&commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, status)
suite.Equal(merr.Status(nil), status)
status, err = suite.cluster.UnsubDmChannel(ctx, 1, &querypb.UnsubDmChannelRequest{
Base: &commonpb.MsgBase{},
@ -289,10 +278,7 @@ func (suite *ClusterTestSuite) TestReleaseSegments() {
Base: &commonpb.MsgBase{},
})
suite.NoError(err)
suite.Equal(&commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, status)
suite.Equal(merr.Status(nil), status)
status, err = suite.cluster.ReleaseSegments(ctx, 1, &querypb.ReleaseSegmentsRequest{
Base: &commonpb.MsgBase{},
@ -310,10 +296,7 @@ func (suite *ClusterTestSuite) TestLoadAndReleasePartitions() {
Base: &commonpb.MsgBase{},
})
suite.NoError(err)
suite.Equal(&commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, status)
suite.Equal(merr.Status(nil), status)
status, err = suite.cluster.LoadPartitions(ctx, 1, &querypb.LoadPartitionsRequest{
Base: &commonpb.MsgBase{},
@ -328,10 +311,7 @@ func (suite *ClusterTestSuite) TestLoadAndReleasePartitions() {
Base: &commonpb.MsgBase{},
})
suite.NoError(err)
suite.Equal(&commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, status)
suite.Equal(merr.Status(nil), status)
status, err = suite.cluster.ReleasePartitions(ctx, 1, &querypb.ReleasePartitionsRequest{
Base: &commonpb.MsgBase{},
@ -349,10 +329,7 @@ func (suite *ClusterTestSuite) TestGetDataDistribution() {
Base: &commonpb.MsgBase{},
})
suite.NoError(err)
suite.Equal(&commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, resp.GetStatus())
suite.Equal(merr.Status(nil), resp.GetStatus())
resp, err = suite.cluster.GetDataDistribution(ctx, 1, &querypb.GetDataDistributionRequest{
Base: &commonpb.MsgBase{},
@ -369,10 +346,7 @@ func (suite *ClusterTestSuite) TestGetMetrics() {
ctx := context.TODO()
resp, err := suite.cluster.GetMetrics(ctx, 0, &milvuspb.GetMetricsRequest{})
suite.NoError(err)
suite.Equal(&commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, resp.GetStatus())
suite.Equal(merr.Status(nil), resp.GetStatus())
resp, err = suite.cluster.GetMetrics(ctx, 1, &milvuspb.GetMetricsRequest{})
suite.NoError(err)
@ -388,10 +362,7 @@ func (suite *ClusterTestSuite) TestSyncDistribution() {
Base: &commonpb.MsgBase{},
})
suite.NoError(err)
suite.Equal(&commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, status)
suite.Equal(merr.Status(nil), status)
status, err = suite.cluster.SyncDistribution(ctx, 1, &querypb.SyncDistributionRequest{
Base: &commonpb.MsgBase{},

89
internal/rootcoord/import_manager_test.go
View File

@ -35,6 +35,7 @@ import (
"github.com/milvus-io/milvus/internal/proto/datapb"
"github.com/milvus-io/milvus/internal/proto/rootcoordpb"
importutil2 "github.com/milvus-io/milvus/internal/util/importutil"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/paramtable"
"github.com/milvus-io/milvus/pkg/util/typeutil"
)
@ -91,22 +92,16 @@ func TestImportManager_NewImportManager(t *testing.T) {
callImportServiceFn := func(ctx context.Context, req *datapb.ImportTaskRequest) (*datapb.ImportTaskResponse, error) {
if mockCallImportServiceErr {
return &datapb.ImportTaskResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, errors.New("mock err")
}
return &datapb.ImportTaskResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
callGetSegmentStates := func(ctx context.Context, req *datapb.GetSegmentStatesRequest) (*datapb.GetSegmentStatesResponse, error) {
return &datapb.GetSegmentStatesResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
var wg sync.WaitGroup
@ -351,23 +346,17 @@ func TestImportManager_TestEtcdCleanUp(t *testing.T) {
callImportServiceFn := func(ctx context.Context, req *datapb.ImportTaskRequest) (*datapb.ImportTaskResponse, error) {
if mockCallImportServiceErr {
return &datapb.ImportTaskResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, errors.New("mock err")
}
return &datapb.ImportTaskResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
callGetSegmentStates := func(ctx context.Context, req *datapb.GetSegmentStatesRequest) (*datapb.GetSegmentStatesResponse, error) {
return &datapb.GetSegmentStatesResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
@ -443,30 +432,22 @@ func TestImportManager_TestFlipTaskStateLoop(t *testing.T) {
callImportServiceFn := func(ctx context.Context, req *datapb.ImportTaskRequest) (*datapb.ImportTaskResponse, error) {
if mockCallImportServiceErr {
return &datapb.ImportTaskResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, errors.New("mock err")
}
return &datapb.ImportTaskResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
callGetSegmentStates := func(ctx context.Context, req *datapb.GetSegmentStatesRequest) (*datapb.GetSegmentStatesResponse, error) {
return &datapb.GetSegmentStatesResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
callUnsetIsImportingState := func(context.Context, *datapb.UnsetIsImportingStateRequest) (*commonpb.Status, error) {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil
return merr.Status(nil), nil
}
flipPersistedTaskInterval = 20
@ -536,9 +517,7 @@ func TestImportManager_ImportJob(t *testing.T) {
mockKv := memkv.NewMemoryKV()
callGetSegmentStates := func(ctx context.Context, req *datapb.GetSegmentStatesRequest) (*datapb.GetSegmentStatesResponse, error) {
return &datapb.GetSegmentStatesResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
// nil request
@ -593,9 +572,7 @@ func TestImportManager_ImportJob(t *testing.T) {
importServiceFunc = func(ctx context.Context, req *datapb.ImportTaskRequest) (*datapb.ImportTaskResponse, error) {
return &datapb.ImportTaskResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
@ -624,9 +601,7 @@ func TestImportManager_ImportJob(t *testing.T) {
}
count++
return &datapb.ImportTaskResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
@ -690,9 +665,7 @@ func TestImportManager_AllDataNodesBusy(t *testing.T) {
if count < len(dnList) {
count++
return &datapb.ImportTaskResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
DatanodeId: dnList[count-1],
}, nil
}
@ -705,9 +678,7 @@ func TestImportManager_AllDataNodesBusy(t *testing.T) {
callGetSegmentStates := func(ctx context.Context, req *datapb.GetSegmentStatesRequest) (*datapb.GetSegmentStatesResponse, error) {
return &datapb.GetSegmentStatesResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
@ -767,9 +738,7 @@ func TestImportManager_TaskState(t *testing.T) {
mockKv := memkv.NewMemoryKV()
importServiceFunc := func(ctx context.Context, req *datapb.ImportTaskRequest) (*datapb.ImportTaskResponse, error) {
return &datapb.ImportTaskResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
@ -780,9 +749,7 @@ func TestImportManager_TaskState(t *testing.T) {
}
callGetSegmentStates := func(ctx context.Context, req *datapb.GetSegmentStatesRequest) (*datapb.GetSegmentStatesResponse, error) {
return &datapb.GetSegmentStatesResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
@ -818,9 +785,7 @@ func TestImportManager_TaskState(t *testing.T) {
}
mgr.callUnsetIsImportingState = func(context.Context, *datapb.UnsetIsImportingStateRequest) (*commonpb.Status, error) {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil
return merr.Status(nil), nil
}
// index doesn't exist, the persist task will be set to completed
ti, err := mgr.updateTaskInfo(info)
@ -877,9 +842,7 @@ func TestImportManager_AllocFail(t *testing.T) {
mockKv := memkv.NewMemoryKV()
importServiceFunc := func(ctx context.Context, req *datapb.ImportTaskRequest) (*datapb.ImportTaskResponse, error) {
return &datapb.ImportTaskResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
@ -891,9 +854,7 @@ func TestImportManager_AllocFail(t *testing.T) {
callGetSegmentStates := func(ctx context.Context, req *datapb.GetSegmentStatesRequest) (*datapb.GetSegmentStatesResponse, error) {
return &datapb.GetSegmentStatesResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
mgr := newImportManager(context.TODO(), mockKv, idAlloc, importServiceFunc, callGetSegmentStates, nil, nil)
@ -926,9 +887,7 @@ func TestImportManager_ListAllTasks(t *testing.T) {
callGetSegmentStates := func(ctx context.Context, req *datapb.GetSegmentStatesRequest) (*datapb.GetSegmentStatesResponse, error) {
return &datapb.GetSegmentStatesResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
@ -1037,9 +996,7 @@ func TestImportManager_ListAllTasks(t *testing.T) {
// accept tasks to working list
mgr.callImportService = func(ctx context.Context, req *datapb.ImportTaskRequest) (*datapb.ImportTaskResponse, error) {
return &datapb.ImportTaskResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}

14
internal/rootcoord/proxy_client_manager_test.go
View File

@ -30,6 +30,7 @@ import (
"github.com/milvus-io/milvus/internal/types"
"github.com/milvus-io/milvus/internal/util/sessionutil"
"github.com/milvus-io/milvus/pkg/util/etcd"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/paramtable"
)
@ -60,9 +61,7 @@ func (p *proxyMock) InvalidateCollectionMetaCache(ctx context.Context, request *
}
p.collArray = append(p.collArray, request.CollectionName)
p.collIDs = append(p.collIDs, request.CollectionID)
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil
return merr.Status(nil), nil
}
func (p *proxyMock) GetCollArray() []string {
@ -89,16 +88,11 @@ func (p *proxyMock) InvalidateCredentialCache(ctx context.Context, request *prox
if p.returnGrpcError {
return nil, fmt.Errorf("grpc error")
}
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
}, nil
return merr.Status(nil), nil
}
func (p *proxyMock) RefreshPolicyInfoCache(ctx context.Context, req *proxypb.RefreshPolicyInfoCacheRequest) (*commonpb.Status, error) {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil
return merr.Status(nil), nil
}
func TestProxyClientManager_GetProxyClients(t *testing.T) {

17
internal/rootcoord/root_coord_test.go
View File

@ -48,6 +48,7 @@ import (
"github.com/milvus-io/milvus/internal/util/sessionutil"
"github.com/milvus-io/milvus/pkg/util/etcd"
"github.com/milvus-io/milvus/pkg/util/funcutil"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/metricsinfo"
"github.com/milvus-io/milvus/pkg/util/paramtable"
"github.com/milvus-io/milvus/pkg/util/tikv"
@ -1403,30 +1404,22 @@ func TestCore_ReportImport(t *testing.T) {
callImportServiceFn := func(ctx context.Context, req *datapb.ImportTaskRequest) (*datapb.ImportTaskResponse, error) {
if mockCallImportServiceErr {
return &datapb.ImportTaskResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, errors.New("mock err")
}
return &datapb.ImportTaskResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
callGetSegmentStates := func(ctx context.Context, req *datapb.GetSegmentStatesRequest) (*datapb.GetSegmentStatesResponse, error) {
return &datapb.GetSegmentStatesResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
}, nil
}
callUnsetIsImportingState := func(context.Context, *datapb.UnsetIsImportingStateRequest) (*commonpb.Status, error) {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
}, nil
return merr.Status(nil), nil
}
t.Run("not healthy", func(t *testing.T) {

33
internal/util/importutil/import_wrapper_test.go
View File

@ -40,6 +40,7 @@ import (
"github.com/milvus-io/milvus/internal/querycoordv2/params"
"github.com/milvus-io/milvus/internal/storage"
"github.com/milvus-io/milvus/pkg/common"
"github.com/milvus-io/milvus/pkg/util/merr"
"github.com/milvus-io/milvus/pkg/util/paramtable"
"github.com/milvus-io/milvus/pkg/util/timerecord"
)
@ -265,9 +266,7 @@ func Test_ImportWrapperRowBased(t *testing.T) {
assignSegmentFunc, flushFunc, saveSegmentFunc := createMockCallbackFunctions(t, rowCounter)
importResult := &rootcoordpb.ImportResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
TaskId: 1,
DatanodeId: 1,
State: commonpb.ImportState_ImportStarted,
@ -345,9 +344,7 @@ func Test_ImportWrapperColumnBased_numpy(t *testing.T) {
assignSegmentFunc, flushFunc, saveSegmentFunc := createMockCallbackFunctions(t, rowCounter)
importResult := &rootcoordpb.ImportResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
TaskId: 1,
DatanodeId: 1,
State: commonpb.ImportState_ImportStarted,
@ -500,9 +497,7 @@ func Test_ImportWrapperRowBased_perf(t *testing.T) {
schema := perfSchema(dim)
importResult := &rootcoordpb.ImportResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
TaskId: 1,
DatanodeId: 1,
State: commonpb.ImportState_ImportStarted,
@ -676,9 +671,7 @@ func Test_ImportWrapperReportFailRowBased(t *testing.T) {
// success case
importResult := &rootcoordpb.ImportResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
TaskId: 1,
DatanodeId: 1,
State: commonpb.ImportState_ImportStarted,
@ -725,9 +718,7 @@ func Test_ImportWrapperReportFailColumnBased_numpy(t *testing.T) {
// success case
importResult := &rootcoordpb.ImportResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
TaskId: 1,
DatanodeId: 1,
State: commonpb.ImportState_ImportStarted,
@ -870,9 +861,7 @@ func Test_ImportWrapperDoBinlogImport(t *testing.T) {
return nil
}
wrapper.importResult = &rootcoordpb.ImportResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
TaskId: 1,
DatanodeId: 1,
State: commonpb.ImportState_ImportStarted,
@ -891,9 +880,7 @@ func Test_ImportWrapperReportPersisted(t *testing.T) {
tr := timerecord.NewTimeRecorder("test")
importResult := &rootcoordpb.ImportResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
TaskId: 1,
DatanodeId: 1,
State: commonpb.ImportState_ImportStarted,
@ -971,9 +958,7 @@ func Test_ImportWrapperFlushFunc(t *testing.T) {
assignSegmentFunc, flushFunc, saveSegmentFunc := createMockCallbackFunctions(t, rowCounter)
importResult := &rootcoordpb.ImportResult{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
},
Status: merr.Status(nil),
TaskId: 1,
DatanodeId: 1,
State: commonpb.ImportState_ImportStarted,

11
internal/util/importutil/json_handler_test.go
View File

@ -26,11 +26,11 @@ import (
"github.com/stretchr/testify/assert"
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
"github.com/milvus-io/milvus/internal/allocator"
"github.com/milvus-io/milvus/internal/proto/rootcoordpb"
"github.com/milvus-io/milvus/internal/storage"
"github.com/milvus-io/milvus/pkg/util/merr"
)
type mockIDAllocator struct {
@ -39,12 +39,9 @@ type mockIDAllocator struct {
func (a *mockIDAllocator) AllocID(ctx context.Context, req *rootcoordpb.AllocIDRequest) (*rootcoordpb.AllocIDResponse, error) {
return &rootcoordpb.AllocIDResponse{
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_Success,
Reason: "",
},
ID: int64(1),
Count: req.Count,
Status: merr.Status(nil),
ID: int64(1),
Count: req.Count,
}, a.allocErr
}