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

Delete ut's useless param for genCollectionSchema (#15119) 

Signed-off-by: xige-16 <xi.ge@zilliz.com>
pull/15251/head
xige-16 2022-01-26 14:21:40 +08:00 committed by GitHub
parent 4776dada09
commit b9d1396258
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/querycoord/cluster_test.go
View File

@ -542,7 +542,7 @@ func TestGrpcRequest(t *testing.T) {
loadSegmentReq := &querypb.LoadSegmentsRequest{
DstNodeID: nodeID,
Infos: []*querypb.SegmentLoadInfo{segmentLoadInfo},
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
CollectionID: defaultCollectionID,
}
err := cluster.loadSegments(baseCtx, nodeID, loadSegmentReq)

50
internal/querycoord/impl_test.go
View File

@ -121,7 +121,7 @@ func TestGrpcTask(t *testing.T) {
MsgType: commonpb.MsgType_LoadPartitions,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
})
assert.Equal(t, commonpb.ErrorCode_UnexpectedError, status.ErrorCode)
assert.Nil(t, err)
@ -134,7 +134,7 @@ func TestGrpcTask(t *testing.T) {
},
CollectionID: defaultCollectionID,
PartitionIDs: []UniqueID{defaultPartitionID},
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
})
assert.Equal(t, commonpb.ErrorCode_Success, status.ErrorCode)
assert.Nil(t, err)
@ -228,7 +228,7 @@ func TestGrpcTask(t *testing.T) {
MsgType: commonpb.MsgType_LoadCollection,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
})
assert.Equal(t, commonpb.ErrorCode_Success, status.ErrorCode)
assert.Nil(t, err)
@ -241,7 +241,7 @@ func TestGrpcTask(t *testing.T) {
// },
// CollectionID: defaultCollectionID,
// PartitionIDs: []UniqueID{defaultPartitionID},
// Schema: genCollectionSchema(defaultCollectionID, false),
// Schema: genDefaultCollectionSchema(defaultCollectionID, false),
// })
// assert.Equal(t, commonpb.ErrorCode_Success, status.ErrorCode)
// assert.Nil(t, err)
@ -430,7 +430,7 @@ func TestGrpcTaskEnqueueFail(t *testing.T) {
},
CollectionID: defaultCollectionID,
PartitionIDs: []UniqueID{defaultPartitionID},
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
})
assert.Equal(t, commonpb.ErrorCode_UnexpectedError, status.ErrorCode)
assert.Nil(t, err)
@ -442,7 +442,7 @@ func TestGrpcTaskEnqueueFail(t *testing.T) {
MsgType: commonpb.MsgType_LoadCollection,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
})
assert.Equal(t, commonpb.ErrorCode_UnexpectedError, status.ErrorCode)
assert.Nil(t, err)
@ -454,7 +454,7 @@ func TestGrpcTaskEnqueueFail(t *testing.T) {
MsgType: commonpb.MsgType_LoadCollection,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
})
assert.Equal(t, commonpb.ErrorCode_Success, status.ErrorCode)
assert.Nil(t, err)
@ -488,7 +488,7 @@ func TestGrpcTaskEnqueueFail(t *testing.T) {
},
CollectionID: defaultCollectionID,
PartitionIDs: []UniqueID{defaultPartitionID},
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
})
assert.Equal(t, commonpb.ErrorCode_Success, status.ErrorCode)
@ -541,7 +541,7 @@ func TestLoadBalanceTask(t *testing.T) {
MsgType: commonpb.MsgType_LoadCollection,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
})
assert.Nil(t, err)
assert.Equal(t, commonpb.ErrorCode_Success, res.ErrorCode)
@ -607,7 +607,7 @@ func TestGrpcTaskBeforeHealthy(t *testing.T) {
},
CollectionID: defaultCollectionID,
PartitionIDs: []UniqueID{defaultPartitionID},
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
})
assert.Equal(t, commonpb.ErrorCode_UnexpectedError, status.ErrorCode)
assert.Nil(t, err)
@ -654,7 +654,7 @@ func TestGrpcTaskBeforeHealthy(t *testing.T) {
MsgType: commonpb.MsgType_LoadCollection,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
})
assert.Equal(t, commonpb.ErrorCode_UnexpectedError, status.ErrorCode)
assert.Nil(t, err)
@ -789,7 +789,7 @@ func Test_RepeatedLoadSameCollection(t *testing.T) {
MsgType: commonpb.MsgType_LoadCollection,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
//first load defaultCollectionID
@ -824,7 +824,7 @@ func Test_LoadCollectionAndLoadPartitions(t *testing.T) {
MsgType: commonpb.MsgType_LoadCollection,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
loadPartitionReq := &querypb.LoadPartitionsRequest{
@ -833,7 +833,7 @@ func Test_LoadCollectionAndLoadPartitions(t *testing.T) {
},
CollectionID: defaultCollectionID,
PartitionIDs: []UniqueID{defaultPartitionID},
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
//first load defaultCollectionID
@ -869,7 +869,7 @@ func Test_RepeatedLoadSamePartitions(t *testing.T) {
},
CollectionID: defaultCollectionID,
PartitionIDs: []UniqueID{defaultPartitionID},
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
//first load defaultPartitionID
@ -905,7 +905,7 @@ func Test_RepeatedLoadDifferentPartitions(t *testing.T) {
},
CollectionID: defaultCollectionID,
PartitionIDs: []UniqueID{defaultPartitionID},
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
//first load defaultPartitionID
@ -941,7 +941,7 @@ func Test_LoadPartitionsAndLoadCollection(t *testing.T) {
MsgType: commonpb.MsgType_LoadCollection,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
loadPartitionReq := &querypb.LoadPartitionsRequest{
@ -950,7 +950,7 @@ func Test_LoadPartitionsAndLoadCollection(t *testing.T) {
},
CollectionID: defaultCollectionID,
PartitionIDs: []UniqueID{defaultPartitionID},
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
//first load defaultPartitionID
@ -985,7 +985,7 @@ func Test_LoadAndReleaseCollection(t *testing.T) {
MsgType: commonpb.MsgType_LoadCollection,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
releaseCollectionReq := &querypb.ReleaseCollectionRequest{
@ -1028,7 +1028,7 @@ func Test_LoadAndReleasePartitions(t *testing.T) {
},
CollectionID: defaultCollectionID,
PartitionIDs: []UniqueID{defaultPartitionID},
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
releasePartitionReq := &querypb.ReleasePartitionsRequest{
@ -1071,7 +1071,7 @@ func Test_LoadCollectionAndReleasePartitions(t *testing.T) {
MsgType: commonpb.MsgType_LoadCollection,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
releasePartitionReq := &querypb.ReleasePartitionsRequest{
@ -1115,7 +1115,7 @@ func Test_LoadPartitionsAndReleaseCollection(t *testing.T) {
},
CollectionID: defaultCollectionID,
PartitionIDs: []UniqueID{defaultPartitionID},
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
releaseCollectionReq := &querypb.ReleaseCollectionRequest{
Base: &commonpb.MsgBase{
@ -1156,7 +1156,7 @@ func Test_RepeatedReleaseCollection(t *testing.T) {
MsgType: commonpb.MsgType_LoadCollection,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
releaseCollectionReq := &querypb.ReleaseCollectionRequest{
@ -1204,7 +1204,7 @@ func Test_RepeatedReleaseSamePartitions(t *testing.T) {
},
CollectionID: defaultCollectionID,
PartitionIDs: []UniqueID{defaultPartitionID},
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
releasePartitionReq := &querypb.ReleasePartitionsRequest{
@ -1253,7 +1253,7 @@ func Test_RepeatedReleaseDifferentPartitions(t *testing.T) {
},
CollectionID: defaultCollectionID,
PartitionIDs: []UniqueID{defaultPartitionID, defaultPartitionID + 1},
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
releasePartitionReq := &querypb.ReleasePartitionsRequest{

6
internal/querycoord/index_checker_test.go
View File

@ -63,7 +63,7 @@ func TestReloadFromKV(t *testing.T) {
err = kv.Save(key, string(value))
assert.Nil(t, err)
meta.addCollection(defaultCollectionID, querypb.LoadType_LoadPartition, genCollectionSchema(defaultCollectionID, false))
meta.addCollection(defaultCollectionID, querypb.LoadType_LoadPartition, genDefaultCollectionSchema(false))
t.Run("Test_PartitionNotExist", func(t *testing.T) {
indexChecker, err := newIndexChecker(baseCtx, kv, meta, nil, nil, nil, nil, nil)
@ -133,7 +133,7 @@ func TestCheckIndexLoop(t *testing.T) {
childCancel()
indexChecker.wg.Wait()
})
meta.addCollection(defaultCollectionID, querypb.LoadType_loadCollection, genCollectionSchema(defaultCollectionID, false))
meta.addCollection(defaultCollectionID, querypb.LoadType_loadCollection, genDefaultCollectionSchema(false))
t.Run("Test_GetIndexInfo", func(t *testing.T) {
childCtx, childCancel := context.WithCancel(context.Background())
indexChecker, err := newIndexChecker(childCtx, kv, meta, nil, nil, rootCoord, indexCoord, nil)
@ -172,7 +172,7 @@ func TestHandoffNotExistSegment(t *testing.T) {
assert.Nil(t, err)
dataCoord.segmentNotExist = true
meta.addCollection(defaultCollectionID, querypb.LoadType_loadCollection, genCollectionSchema(defaultCollectionID, false))
meta.addCollection(defaultCollectionID, querypb.LoadType_loadCollection, genDefaultCollectionSchema(false))
segmentInfo := &querypb.SegmentInfo{
SegmentID: defaultSegmentID,

2
internal/querycoord/meta_test.go
View File

@ -174,7 +174,7 @@ func TestMetaFunc(t *testing.T) {
})
t.Run("Test AddCollection", func(t *testing.T) {
schema := genCollectionSchema(defaultCollectionID, false)
schema := genDefaultCollectionSchema(false)
err := meta.addCollection(defaultCollectionID, querypb.LoadType_loadCollection, schema)
assert.Nil(t, err)
})

4
internal/querycoord/mock_3rd_component_test.go
View File

@ -52,7 +52,7 @@ const (
defaultVecFieldID = 101
)
func genCollectionSchema(collectionID UniqueID, isBinary bool) *schemapb.CollectionSchema {
func genDefaultCollectionSchema(isBinary bool) *schemapb.CollectionSchema {
var fieldVec schemapb.FieldSchema
if isBinary {
fieldVec = schemapb.FieldSchema{
@ -106,7 +106,7 @@ func genCollectionSchema(collectionID UniqueID, isBinary bool) *schemapb.Collect
}
func genETCDCollectionMeta(collectionID UniqueID, isBinary bool) *etcdpb.CollectionMeta {
schema := genCollectionSchema(collectionID, isBinary)
schema := genDefaultCollectionSchema(isBinary)
collectionMeta := etcdpb.CollectionMeta{
ID: collectionID,
Schema: schema,

2
internal/querycoord/query_coord_test.go
View File

@ -548,7 +548,7 @@ func TestLoadBalanceSegmentLoop(t *testing.T) {
},
CollectionID: defaultCollectionID,
PartitionIDs: []UniqueID{partitionID},
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
baseTask := newBaseTask(baseCtx, querypb.TriggerCondition_GrpcRequest)
loadPartitionTask := &loadPartitionTask{

6
internal/querycoord/querynode_test.go
View File

@ -119,7 +119,7 @@ func TestQueryNode_MultiNode_stop(t *testing.T) {
MsgType: commonpb.MsgType_LoadCollection,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
})
_, err = queryCoord.ReleaseCollection(baseCtx, &querypb.ReleaseCollectionRequest{
Base: &commonpb.MsgBase{
@ -158,7 +158,7 @@ func TestQueryNode_MultiNode_reStart(t *testing.T) {
MsgType: commonpb.MsgType_LoadCollection,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
})
queryNode1.stop()
err = removeNodeSession(queryNode1.queryNodeID)
@ -257,7 +257,7 @@ func TestSealedSegmentChangeAfterQueryNodeStop(t *testing.T) {
MsgType: commonpb.MsgType_LoadCollection,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
})
queryNode2, err := startQueryNodeServer(baseCtx)

2
internal/querycoord/segment_allocator_test.go
View File

@ -69,7 +69,7 @@ func TestShuffleSegmentsToQueryNode(t *testing.T) {
cluster.dataKV, err = minioKV.NewMinIOKV(baseCtx, option)
assert.Nil(t, err)
schema := genCollectionSchema(defaultCollectionID, false)
schema := genDefaultCollectionSchema(false)
firstReq := &querypb.LoadSegmentsRequest{
CollectionID: defaultCollectionID,
Schema: schema,

18
internal/querycoord/task_test.go
View File

@ -36,7 +36,7 @@ func genLoadCollectionTask(ctx context.Context, queryCoord *QueryCoord) *loadCol
MsgType: commonpb.MsgType_LoadCollection,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
baseTask := newBaseTask(ctx, querypb.TriggerCondition_GrpcRequest)
loadCollectionTask := &loadCollectionTask{
@ -59,7 +59,7 @@ func genLoadPartitionTask(ctx context.Context, queryCoord *QueryCoord) *loadPart
},
CollectionID: defaultCollectionID,
PartitionIDs: []UniqueID{defaultPartitionID},
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
baseTask := newBaseTask(ctx, querypb.TriggerCondition_GrpcRequest)
loadPartitionTask := &loadPartitionTask{
@ -132,7 +132,7 @@ func genReleaseSegmentTask(ctx context.Context, queryCoord *QueryCoord, nodeID i
}
func genWatchDmChannelTask(ctx context.Context, queryCoord *QueryCoord, nodeID int64) *watchDmChannelTask {
schema := genCollectionSchema(defaultCollectionID, false)
schema := genDefaultCollectionSchema(false)
vChannelInfo := &datapb.VchannelInfo{
CollectionID: defaultCollectionID,
ChannelName: "testDmChannel",
@ -162,7 +162,7 @@ func genWatchDmChannelTask(ctx context.Context, queryCoord *QueryCoord, nodeID i
MsgType: commonpb.MsgType_LoadCollection,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
baseParentTask := newBaseTask(ctx, querypb.TriggerCondition_GrpcRequest)
baseParentTask.taskID = 10
@ -186,7 +186,7 @@ func genWatchDmChannelTask(ctx context.Context, queryCoord *QueryCoord, nodeID i
}
func genLoadSegmentTask(ctx context.Context, queryCoord *QueryCoord, nodeID int64) *loadSegmentTask {
queryCoord.meta.setDeltaChannel(defaultCollectionID, nil)
schema := genCollectionSchema(defaultCollectionID, false)
schema := genDefaultCollectionSchema(false)
segmentInfo := &querypb.SegmentLoadInfo{
SegmentID: defaultSegmentID,
PartitionID: defaultPartitionID,
@ -216,7 +216,7 @@ func genLoadSegmentTask(ctx context.Context, queryCoord *QueryCoord, nodeID int6
MsgType: commonpb.MsgType_LoadCollection,
},
CollectionID: defaultCollectionID,
Schema: genCollectionSchema(defaultCollectionID, false),
Schema: genDefaultCollectionSchema(false),
}
baseParentTask := newBaseTask(ctx, querypb.TriggerCondition_GrpcRequest)
baseParentTask.taskID = 10
@ -672,7 +672,7 @@ func Test_AssignInternalTask(t *testing.T) {
assert.Nil(t, err)
waitQueryNodeOnline(queryCoord.cluster, node1.queryNodeID)
schema := genCollectionSchema(defaultCollectionID, false)
schema := genDefaultCollectionSchema(false)
loadCollectionTask := genLoadCollectionTask(ctx, queryCoord)
loadSegmentRequests := make([]*querypb.LoadSegmentsRequest, 0)
binlogs := make([]*datapb.FieldBinlog, 0)
@ -1253,7 +1253,7 @@ func TestUpdateTaskProcessWhenLoadSegment(t *testing.T) {
node1, err := startQueryNodeServer(ctx)
assert.Nil(t, err)
waitQueryNodeOnline(queryCoord.cluster, node1.queryNodeID)
queryCoord.meta.addCollection(defaultCollectionID, querypb.LoadType_loadCollection, genCollectionSchema(defaultCollectionID, false))
queryCoord.meta.addCollection(defaultCollectionID, querypb.LoadType_loadCollection, genDefaultCollectionSchema(false))
loadSegmentTask := genLoadSegmentTask(ctx, queryCoord, node1.queryNodeID)
loadCollectionTask := loadSegmentTask.getParentTask()
@ -1286,7 +1286,7 @@ func TestUpdateTaskProcessWhenWatchDmChannel(t *testing.T) {
node1, err := startQueryNodeServer(ctx)
assert.Nil(t, err)
waitQueryNodeOnline(queryCoord.cluster, node1.queryNodeID)
queryCoord.meta.addCollection(defaultCollectionID, querypb.LoadType_loadCollection, genCollectionSchema(defaultCollectionID, false))
queryCoord.meta.addCollection(defaultCollectionID, querypb.LoadType_loadCollection, genDefaultCollectionSchema(false))
watchDmChannel := genWatchDmChannelTask(ctx, queryCoord, node1.queryNodeID)
loadCollectionTask := watchDmChannel.getParentTask()