admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use different schema generation functions (#7884)

Browse Source 
Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
This commit is contained in:
bigsheeper 2021-09-15 10:07:56 +08:00 committed by GitHub
parent c16ab5b35c
commit dfc2535aaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/querynode/impl_test.go
View File

@ -108,7 +108,7 @@ func TestImpl_WatchDmChannels(t *testing.T) {
node, err := genSimpleQueryNode(ctx)
assert.NoError(t, err)
_, schema := genSimpleSchema()
schema := genSimpleSegCoreSchema()
req := &queryPb.WatchDmChannelsRequest{
Base: &commonpb.MsgBase{
@ -137,7 +137,7 @@ func TestImpl_LoadSegments(t *testing.T) {
node, err := genSimpleQueryNode(ctx)
assert.NoError(t, err)
_, schema := genSimpleSchema()
schema := genSimpleSegCoreSchema()
req := &queryPb.LoadSegmentsRequest{
Base: &commonpb.MsgBase{

51
internal/querynode/mock_test.go
View File

@ -266,13 +266,28 @@ func generateIndex(segmentID UniqueID) ([]string, error) {
return indexPaths, nil
}
func genSimpleSchema() (*schemapb.CollectionSchema, *schemapb.CollectionSchema) {
func genSimpleSegCoreSchema() *schemapb.CollectionSchema {
fieldVec := genFloatVectorField(simpleVecField)
fieldInt := genConstantField(simpleConstField)
schema := schemapb.CollectionSchema{ // schema for segCore
Name: defaultCollectionName,
AutoID: true,
Fields: []*schemapb.FieldSchema{
fieldVec,
fieldInt,
},
}
return &schema
}
func genSimpleInsertDataSchema() *schemapb.CollectionSchema {
fieldUID := genConstantField(uidField)
fieldTimestamp := genConstantField(timestampField)
fieldVec := genFloatVectorField(simpleVecField)
fieldInt := genConstantField(simpleConstField)
schema1 := schemapb.CollectionSchema{ // schema for insertData
schema := schemapb.CollectionSchema{ // schema for insertData
Name: defaultCollectionName,
AutoID: true,
Fields: []*schemapb.FieldSchema{
@ -282,15 +297,7 @@ func genSimpleSchema() (*schemapb.CollectionSchema, *schemapb.CollectionSchema)
fieldInt,
},
}
schema2 := schemapb.CollectionSchema{ // schema for segCore
Name: defaultCollectionName,
AutoID: true,
Fields: []*schemapb.FieldSchema{
fieldVec,
fieldInt,
},
}
return &schema1, &schema2
return &schema
}
func genCollectionMeta(collectionID UniqueID, schema *schemapb.CollectionSchema) *etcdpb.CollectionMeta {
@ -303,7 +310,7 @@ func genCollectionMeta(collectionID UniqueID, schema *schemapb.CollectionSchema)
}
func genSimpleCollectionMeta() *etcdpb.CollectionMeta {
simpleSchema, _ := genSimpleSchema()
simpleSchema := genSimpleInsertDataSchema()
return genCollectionMeta(defaultCollectionID, simpleSchema)
}
@ -389,7 +396,7 @@ func genVectorChunkManager(ctx context.Context) (storage.ChunkManager, error) {
}
rcm := storage.NewMinioChunkManager(client)
schema, _ := genSimpleSchema()
schema := genSimpleInsertDataSchema()
vcm := storage.NewVectorChunkManager(lcm, rcm, &etcdpb.CollectionMeta{
ID: defaultCollectionID,
Schema: schema,
@ -501,7 +508,7 @@ func genInsertData(msgLength int, schema *schemapb.CollectionSchema) (*storage.I
}
func genSimpleInsertData() (*storage.InsertData, error) {
schema, _ := genSimpleSchema()
schema := genSimpleInsertDataSchema()
return genInsertData(defaultMsgLength, schema)
}
@ -537,7 +544,7 @@ func genStorageBlob(collectionID UniqueID,
}
func genSimpleStorageBlob() ([]*storage.Blob, error) {
schema, _ := genSimpleSchema()
schema := genSimpleInsertDataSchema()
return genStorageBlob(defaultCollectionID, defaultPartitionID, defaultSegmentID, defaultMsgLength, schema)
}
@ -599,7 +606,7 @@ func genCommonBlob(msgLength int, schema *schemapb.CollectionSchema) ([]*commonp
}
func genSimpleCommonBlob() ([]*commonpb.Blob, error) {
_, schema := genSimpleSchema()
schema := genSimpleSegCoreSchema()
return genCommonBlob(defaultMsgLength, schema)
}
@ -648,7 +655,7 @@ func saveBinLog(ctx context.Context,
}
func saveSimpleBinLog(ctx context.Context) ([]*datapb.FieldBinlog, error) {
schema, _ := genSimpleSchema()
schema := genSimpleInsertDataSchema()
return saveBinLog(ctx, defaultCollectionID, defaultPartitionID, defaultSegmentID, defaultMsgLength, schema)
}
@ -709,7 +716,7 @@ func genSimpleInsertMsg() (*msgstream.InsertMsg, error) {
// ---------- unittest util functions ----------
// functions of replica
func genSimpleSealedSegment() (*Segment, error) {
_, schema := genSimpleSchema()
schema := genSimpleSegCoreSchema()
col := newCollection(defaultCollectionID, schema)
seg := newSegment(col,
defaultSegmentID,
@ -777,7 +784,7 @@ func genSimpleReplica() (ReplicaInterface, error) {
return nil, err
}
r := newCollectionReplica(kv)
_, schema := genSimpleSchema()
schema := genSimpleSegCoreSchema()
err = r.addCollection(defaultCollectionID, schema)
if err != nil {
return nil, err
@ -887,7 +894,7 @@ func genDSL(schema *schemapb.CollectionSchema, nProb int, topK int64) (string, e
}
func genSimpleDSL() (string, error) {
_, schema := genSimpleSchema()
schema := genSimpleSegCoreSchema()
return genDSL(schema, defaultNProb, defaultTopK)
}
@ -923,7 +930,7 @@ func genSimplePlaceHolderGroup() ([]byte, error) {
}
func genSimpleSearchPlanAndRequests() (*SearchPlan, []*searchRequest, error) {
_, schema := genSimpleSchema()
schema := genSimpleSegCoreSchema()
collection := newCollection(defaultCollectionID, schema)
var plan *SearchPlan
@ -1000,7 +1007,7 @@ func genSimpleRetrievePlan() (*RetrievePlan, error) {
}
timestamp := retrieveMsg.RetrieveRequest.TravelTimestamp
_, schema := genSimpleSchema()
schema := genSimpleSegCoreSchema()
collection := newCollection(defaultCollectionID, schema)
planExpr, err := genSimpleRetrievePlanExpr()

4
internal/querynode/segment_loader_test.go
View File

@ -40,7 +40,7 @@ func TestSegmentLoader_loadSegment(t *testing.T) {
kv, err := genEtcdKV()
assert.NoError(t, err)
schema, _ := genSimpleSchema()
schema := genSimpleInsertDataSchema()
fieldBinlog, err := saveSimpleBinLog(ctx)
assert.NoError(t, err)
@ -124,7 +124,7 @@ func TestSegmentLoader_notOnService(t *testing.T) {
loader := newSegmentLoader(ctx, nil, nil, historical.replica, kv)
assert.NotNil(t, loader)
schema, _ := genSimpleSchema()
schema := genSimpleInsertDataSchema()
fieldBinlog, err := saveSimpleBinLog(ctx)
assert.NoError(t, err)

14
internal/querynode/segment_test.go
View File

@ -819,7 +819,7 @@ func TestSegment_indexInfoTest(t *testing.T) {
}
func TestSegment_BasicMetrics(t *testing.T) {
_, schema := genSimpleSchema()
schema := genSimpleSegCoreSchema()
collection := newCollection(defaultCollectionID, schema)
segment := newSegment(collection,
defaultSegmentID,
@ -878,7 +878,7 @@ func TestSegment_fillVectorFieldsData(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
_, schema := genSimpleSchema()
schema := genSimpleSegCoreSchema()
collection := newCollection(defaultCollectionID, schema)
segment := newSegment(collection,
defaultSegmentID,
@ -931,7 +931,7 @@ func TestSegment_fillVectorFieldsData(t *testing.T) {
}
func TestSegment_indexParam(t *testing.T) {
_, schema := genSimpleSchema()
schema := genSimpleSegCoreSchema()
collection := newCollection(defaultCollectionID, schema)
segment := newSegment(collection,
defaultSegmentID,
@ -990,7 +990,7 @@ func TestSegment_dropFieldData(t *testing.T) {
func TestSegment_updateSegmentIndex(t *testing.T) {
t.Run("test updateSegmentIndex invalid", func(t *testing.T) {
_, schema := genSimpleSchema()
schema := genSimpleSegCoreSchema()
collection := newCollection(defaultCollectionID, schema)
segment := newSegment(collection,
defaultSegmentID,
@ -1029,7 +1029,7 @@ func TestSegment_updateSegmentIndex(t *testing.T) {
func TestSegment_dropSegmentIndex(t *testing.T) {
t.Run("test dropSegmentIndex invalid segment type", func(t *testing.T) {
_, schema := genSimpleSchema()
schema := genSimpleSegCoreSchema()
collection := newCollection(defaultCollectionID, schema)
segment := newSegment(collection,
defaultSegmentID,
@ -1045,7 +1045,7 @@ func TestSegment_dropSegmentIndex(t *testing.T) {
})
t.Run("test dropSegmentIndex nil segment ptr", func(t *testing.T) {
_, schema := genSimpleSchema()
schema := genSimpleSegCoreSchema()
collection := newCollection(defaultCollectionID, schema)
segment := newSegment(collection,
defaultSegmentID,
@ -1062,7 +1062,7 @@ func TestSegment_dropSegmentIndex(t *testing.T) {
})
t.Run("test dropSegmentIndex nil index", func(t *testing.T) {
_, schema := genSimpleSchema()
schema := genSimpleSegCoreSchema()
collection := newCollection(defaultCollectionID, schema)
segment := newSegment(collection,
defaultSegmentID,

6
internal/querynode/task_test.go
View File

@ -27,7 +27,7 @@ func TestTask_watchDmChannelsTask(t *testing.T) {
defer cancel()
genWatchDMChannelsRequest := func() *querypb.WatchDmChannelsRequest {
_, schema := genSimpleSchema()
schema := genSimpleSegCoreSchema()
req := &querypb.WatchDmChannelsRequest{
Base: genCommonMsgBase(commonpb.MsgType_WatchDmChannels),
CollectionID: defaultCollectionID,
@ -149,7 +149,7 @@ func TestTask_loadSegmentsTask(t *testing.T) {
defer cancel()
genLoadEmptySegmentsRequest := func() *querypb.LoadSegmentsRequest {
_, schema := genSimpleSchema()
schema := genSimpleSegCoreSchema()
req := &querypb.LoadSegmentsRequest{
Base: genCommonMsgBase(commonpb.MsgType_LoadSegments),
Schema: schema,
@ -186,7 +186,7 @@ func TestTask_loadSegmentsTask(t *testing.T) {
node, err := genSimpleQueryNode(ctx)
assert.NoError(t, err)
schema, _ := genSimpleSchema()
schema := genSimpleInsertDataSchema()
fieldBinlog, err := saveSimpleBinLog(ctx)
assert.NoError(t, err)