Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
5a3fc375
M
milvus
项目概览
milvus
/
milvus
11 个月 前同步成功
通知
261
Star
22476
Fork
2472
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
5a3fc375
编写于
9月 11, 2021
作者:
D
dragondriver
提交者:
GitHub
9月 11, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add test cases for create collection (#7759)
Signed-off-by:
N
dragondriver
<
jiquan.long@zilliz.com
>
上级
ab7ded22
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
353 addition
and
14 deletion
+353
-14
internal/proxy/collection_task_test.go
internal/proxy/collection_task_test.go
+269
-0
internal/proxy/task.go
internal/proxy/task.go
+15
-10
internal/proxy/task_test.go
internal/proxy/task_test.go
+69
-4
未找到文件。
internal/proxy/collection_task_test.go
0 → 100644
浏览文件 @
5a3fc375
// Copyright (C) 2019-2020 Zilliz. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software distributed under the License
// is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
// or implied. See the License for the specific language governing permissions and limitations under the License.
package
proxy
import
(
"context"
"strconv"
"testing"
"time"
"github.com/milvus-io/milvus/internal/proto/schemapb"
"github.com/milvus-io/milvus/internal/proto/commonpb"
"github.com/milvus-io/milvus/internal/util/uniquegenerator"
"github.com/stretchr/testify/assert"
"github.com/golang/protobuf/proto"
"github.com/milvus-io/milvus/internal/util/funcutil"
"github.com/milvus-io/milvus/internal/proto/milvuspb"
)
func
TestCreateCollectionTask
(
t
*
testing
.
T
)
{
Params
.
Init
()
rc
:=
NewRootCoordMock
()
ctx
:=
context
.
Background
()
shardsNum
:=
int32
(
2
)
prefix
:=
"TestCreateCollectionTask"
dbName
:=
""
collectionName
:=
prefix
+
funcutil
.
GenRandomStr
()
int64Field
:=
"int64"
floatVecField
:=
"fvec"
dim
:=
128
schema
:=
constructCollectionSchema
(
int64Field
,
floatVecField
,
dim
,
collectionName
)
var
marshaledSchema
[]
byte
marshaledSchema
,
err
:=
proto
.
Marshal
(
schema
)
assert
.
NoError
(
t
,
err
)
task
:=
&
createCollectionTask
{
Condition
:
NewTaskCondition
(
ctx
),
CreateCollectionRequest
:
&
milvuspb
.
CreateCollectionRequest
{
Base
:
nil
,
DbName
:
dbName
,
CollectionName
:
collectionName
,
Schema
:
marshaledSchema
,
ShardsNum
:
shardsNum
,
},
ctx
:
ctx
,
rootCoord
:
rc
,
result
:
nil
,
schema
:
nil
,
}
t
.
Run
(
"on enqueue"
,
func
(
t
*
testing
.
T
)
{
err
:=
task
.
OnEnqueue
()
assert
.
NoError
(
t
,
err
)
assert
.
Equal
(
t
,
commonpb
.
MsgType_CreateCollection
,
task
.
Type
())
})
t
.
Run
(
"ctx"
,
func
(
t
*
testing
.
T
)
{
traceCtx
:=
task
.
TraceCtx
()
assert
.
NotNil
(
t
,
traceCtx
)
})
t
.
Run
(
"id"
,
func
(
t
*
testing
.
T
)
{
id
:=
UniqueID
(
uniquegenerator
.
GetUniqueIntGeneratorIns
()
.
GetInt
())
task
.
SetID
(
id
)
assert
.
Equal
(
t
,
id
,
task
.
ID
())
})
t
.
Run
(
"name"
,
func
(
t
*
testing
.
T
)
{
assert
.
Equal
(
t
,
CreateCollectionTaskName
,
task
.
Name
())
})
t
.
Run
(
"ts"
,
func
(
t
*
testing
.
T
)
{
ts
:=
Timestamp
(
time
.
Now
()
.
UnixNano
())
task
.
SetTs
(
ts
)
assert
.
Equal
(
t
,
ts
,
task
.
BeginTs
())
assert
.
Equal
(
t
,
ts
,
task
.
EndTs
())
})
t
.
Run
(
"process task"
,
func
(
t
*
testing
.
T
)
{
var
err
error
err
=
task
.
PreExecute
(
ctx
)
assert
.
NoError
(
t
,
err
)
err
=
task
.
Execute
(
ctx
)
assert
.
NoError
(
t
,
err
)
assert
.
Equal
(
t
,
commonpb
.
ErrorCode_Success
,
task
.
result
.
ErrorCode
)
// recreate -> fail
err
=
task
.
Execute
(
ctx
)
assert
.
NoError
(
t
,
err
)
assert
.
NotEqual
(
t
,
commonpb
.
ErrorCode_Success
,
task
.
result
.
ErrorCode
)
err
=
task
.
PostExecute
(
ctx
)
assert
.
NoError
(
t
,
err
)
})
t
.
Run
(
"PreExecute"
,
func
(
t
*
testing
.
T
)
{
var
err
error
err
=
task
.
PreExecute
(
ctx
)
assert
.
NoError
(
t
,
err
)
task
.
Schema
=
[]
byte
{
0x1
,
0x2
,
0x3
,
0x4
}
err
=
task
.
PreExecute
(
ctx
)
assert
.
Error
(
t
,
err
)
task
.
Schema
=
marshaledSchema
task
.
ShardsNum
=
Params
.
MaxShardNum
+
1
err
=
task
.
PreExecute
(
ctx
)
assert
.
Error
(
t
,
err
)
task
.
ShardsNum
=
shardsNum
reqBackup
:=
proto
.
Clone
(
task
.
CreateCollectionRequest
)
.
(
*
milvuspb
.
CreateCollectionRequest
)
schemaBackup
:=
proto
.
Clone
(
schema
)
.
(
*
schemapb
.
CollectionSchema
)
schemaWithTooManyFields
:=
&
schemapb
.
CollectionSchema
{
Name
:
collectionName
,
Description
:
""
,
AutoID
:
false
,
Fields
:
make
([]
*
schemapb
.
FieldSchema
,
Params
.
MaxFieldNum
+
1
),
}
marshaledSchemaWithTooManyFields
,
err
:=
proto
.
Marshal
(
schemaWithTooManyFields
)
assert
.
NoError
(
t
,
err
)
task
.
CreateCollectionRequest
.
Schema
=
marshaledSchemaWithTooManyFields
err
=
task
.
PreExecute
(
ctx
)
assert
.
Error
(
t
,
err
)
task
.
CreateCollectionRequest
=
reqBackup
// ValidateCollectionName
schema
.
Name
=
" "
// empty
emptyNameSchema
,
err
:=
proto
.
Marshal
(
schema
)
assert
.
NoError
(
t
,
err
)
task
.
CreateCollectionRequest
.
Schema
=
emptyNameSchema
err
=
task
.
PreExecute
(
ctx
)
assert
.
Error
(
t
,
err
)
schema
.
Name
=
prefix
for
i
:=
0
;
i
<
int
(
Params
.
MaxNameLength
);
i
++
{
schema
.
Name
+=
strconv
.
Itoa
(
i
%
10
)
}
tooLongNameSchema
,
err
:=
proto
.
Marshal
(
schema
)
assert
.
NoError
(
t
,
err
)
task
.
CreateCollectionRequest
.
Schema
=
tooLongNameSchema
err
=
task
.
PreExecute
(
ctx
)
assert
.
Error
(
t
,
err
)
schema
.
Name
=
"$"
// invalid first char
invalidFirstCharSchema
,
err
:=
proto
.
Marshal
(
schema
)
assert
.
NoError
(
t
,
err
)
task
.
CreateCollectionRequest
.
Schema
=
invalidFirstCharSchema
err
=
task
.
PreExecute
(
ctx
)
assert
.
Error
(
t
,
err
)
// ValidateDuplicatedFieldName
schema
=
proto
.
Clone
(
schemaBackup
)
.
(
*
schemapb
.
CollectionSchema
)
schema
.
Fields
=
append
(
schema
.
Fields
,
schema
.
Fields
[
0
])
duplicatedFieldsSchema
,
err
:=
proto
.
Marshal
(
schema
)
assert
.
NoError
(
t
,
err
)
task
.
CreateCollectionRequest
.
Schema
=
duplicatedFieldsSchema
err
=
task
.
PreExecute
(
ctx
)
assert
.
Error
(
t
,
err
)
// ValidatePrimaryKey
schema
=
proto
.
Clone
(
schemaBackup
)
.
(
*
schemapb
.
CollectionSchema
)
for
idx
:=
range
schema
.
Fields
{
schema
.
Fields
[
idx
]
.
IsPrimaryKey
=
false
}
noPrimaryFieldsSchema
,
err
:=
proto
.
Marshal
(
schema
)
assert
.
NoError
(
t
,
err
)
task
.
CreateCollectionRequest
.
Schema
=
noPrimaryFieldsSchema
err
=
task
.
PreExecute
(
ctx
)
assert
.
Error
(
t
,
err
)
// ValidateFieldName
schema
=
proto
.
Clone
(
schemaBackup
)
.
(
*
schemapb
.
CollectionSchema
)
for
idx
:=
range
schema
.
Fields
{
schema
.
Fields
[
idx
]
.
Name
=
"$"
}
invalidFieldNameSchema
,
err
:=
proto
.
Marshal
(
schema
)
assert
.
NoError
(
t
,
err
)
task
.
CreateCollectionRequest
.
Schema
=
invalidFieldNameSchema
err
=
task
.
PreExecute
(
ctx
)
assert
.
Error
(
t
,
err
)
// ValidateVectorField
schema
=
proto
.
Clone
(
schemaBackup
)
.
(
*
schemapb
.
CollectionSchema
)
for
idx
:=
range
schema
.
Fields
{
if
schema
.
Fields
[
idx
]
.
DataType
==
schemapb
.
DataType_FloatVector
||
schema
.
Fields
[
idx
]
.
DataType
==
schemapb
.
DataType_BinaryVector
{
schema
.
Fields
[
idx
]
.
TypeParams
=
nil
}
}
noDimSchema
,
err
:=
proto
.
Marshal
(
schema
)
assert
.
NoError
(
t
,
err
)
task
.
CreateCollectionRequest
.
Schema
=
noDimSchema
err
=
task
.
PreExecute
(
ctx
)
assert
.
Error
(
t
,
err
)
schema
=
proto
.
Clone
(
schemaBackup
)
.
(
*
schemapb
.
CollectionSchema
)
for
idx
:=
range
schema
.
Fields
{
if
schema
.
Fields
[
idx
]
.
DataType
==
schemapb
.
DataType_FloatVector
||
schema
.
Fields
[
idx
]
.
DataType
==
schemapb
.
DataType_BinaryVector
{
schema
.
Fields
[
idx
]
.
TypeParams
=
[]
*
commonpb
.
KeyValuePair
{
{
Key
:
"dim"
,
Value
:
"not int"
,
},
}
}
}
dimNotIntSchema
,
err
:=
proto
.
Marshal
(
schema
)
assert
.
NoError
(
t
,
err
)
task
.
CreateCollectionRequest
.
Schema
=
dimNotIntSchema
err
=
task
.
PreExecute
(
ctx
)
assert
.
Error
(
t
,
err
)
schema
=
proto
.
Clone
(
schemaBackup
)
.
(
*
schemapb
.
CollectionSchema
)
for
idx
:=
range
schema
.
Fields
{
if
schema
.
Fields
[
idx
]
.
DataType
==
schemapb
.
DataType_FloatVector
||
schema
.
Fields
[
idx
]
.
DataType
==
schemapb
.
DataType_BinaryVector
{
schema
.
Fields
[
idx
]
.
TypeParams
=
[]
*
commonpb
.
KeyValuePair
{
{
Key
:
"dim"
,
Value
:
strconv
.
Itoa
(
int
(
Params
.
MaxDimension
)
+
1
),
},
}
}
}
tooLargeDimSchema
,
err
:=
proto
.
Marshal
(
schema
)
assert
.
NoError
(
t
,
err
)
task
.
CreateCollectionRequest
.
Schema
=
tooLargeDimSchema
err
=
task
.
PreExecute
(
ctx
)
assert
.
Error
(
t
,
err
)
schema
=
proto
.
Clone
(
schemaBackup
)
.
(
*
schemapb
.
CollectionSchema
)
schema
.
Fields
[
1
]
.
DataType
=
schemapb
.
DataType_BinaryVector
schema
.
Fields
[
1
]
.
TypeParams
=
[]
*
commonpb
.
KeyValuePair
{
{
Key
:
"dim"
,
Value
:
strconv
.
Itoa
(
int
(
Params
.
MaxDimension
)
+
1
),
},
}
binaryTooLargeDimSchema
,
err
:=
proto
.
Marshal
(
schema
)
assert
.
NoError
(
t
,
err
)
task
.
CreateCollectionRequest
.
Schema
=
binaryTooLargeDimSchema
err
=
task
.
PreExecute
(
ctx
)
assert
.
Error
(
t
,
err
)
})
}
internal/proxy/task.go
浏览文件 @
5a3fc375
...
@@ -48,12 +48,12 @@ import (
...
@@ -48,12 +48,12 @@ import (
)
)
const
(
const
(
InsertTaskName
=
"
i
nsertTask"
InsertTaskName
=
"
I
nsertTask"
CreateCollectionTaskName
=
"CreateCollectionTask"
CreateCollectionTaskName
=
"CreateCollectionTask"
DropCollectionTaskName
=
"DropCollectionTask"
DropCollectionTaskName
=
"DropCollectionTask"
SearchTaskName
=
"
s
earchTask"
SearchTaskName
=
"
S
earchTask"
RetrieveTaskName
=
"RetrieveTask"
RetrieveTaskName
=
"RetrieveTask"
QueryTaskName
=
"
q
ueryTask"
QueryTaskName
=
"
Q
ueryTask"
AnnsFieldKey
=
"anns_field"
AnnsFieldKey
=
"anns_field"
TopKKey
=
"topk"
TopKKey
=
"topk"
MetricTypeKey
=
"metric_type"
MetricTypeKey
=
"metric_type"
...
@@ -67,12 +67,12 @@ const (
...
@@ -67,12 +67,12 @@ const (
DropPartitionTaskName
=
"DropPartitionTask"
DropPartitionTaskName
=
"DropPartitionTask"
HasPartitionTaskName
=
"HasPartitionTask"
HasPartitionTaskName
=
"HasPartitionTask"
ShowPartitionTaskName
=
"ShowPartitionTask"
ShowPartitionTaskName
=
"ShowPartitionTask"
CreateIndexTaskName
=
"
c
reateIndexTask"
CreateIndexTaskName
=
"
C
reateIndexTask"
DescribeIndexTaskName
=
"
d
escribeIndexTask"
DescribeIndexTaskName
=
"
D
escribeIndexTask"
DropIndexTaskName
=
"
d
ropIndexTask"
DropIndexTaskName
=
"
D
ropIndexTask"
GetIndexStateTaskName
=
"
g
etIndexStateTask"
GetIndexStateTaskName
=
"
G
etIndexStateTask"
GetIndexBuildProgressTaskName
=
"
g
etIndexBuildProgressTask"
GetIndexBuildProgressTaskName
=
"
G
etIndexBuildProgressTask"
FlushTaskName
=
"
f
lushTask"
FlushTaskName
=
"
F
lushTask"
LoadCollectionTaskName
=
"LoadCollectionTask"
LoadCollectionTaskName
=
"LoadCollectionTask"
ReleaseCollectionTaskName
=
"ReleaseCollectionTask"
ReleaseCollectionTaskName
=
"ReleaseCollectionTask"
LoadPartitionTaskName
=
"LoadPartitionsTask"
LoadPartitionTaskName
=
"LoadPartitionsTask"
...
@@ -1112,6 +1112,8 @@ func (cct *createCollectionTask) SetTs(ts Timestamp) {
...
@@ -1112,6 +1112,8 @@ func (cct *createCollectionTask) SetTs(ts Timestamp) {
func
(
cct
*
createCollectionTask
)
OnEnqueue
()
error
{
func
(
cct
*
createCollectionTask
)
OnEnqueue
()
error
{
cct
.
Base
=
&
commonpb
.
MsgBase
{}
cct
.
Base
=
&
commonpb
.
MsgBase
{}
cct
.
Base
.
MsgType
=
commonpb
.
MsgType_CreateCollection
cct
.
Base
.
SourceID
=
Params
.
ProxyID
return
nil
return
nil
}
}
...
@@ -1121,8 +1123,11 @@ func (cct *createCollectionTask) PreExecute(ctx context.Context) error {
...
@@ -1121,8 +1123,11 @@ func (cct *createCollectionTask) PreExecute(ctx context.Context) error {
cct
.
schema
=
&
schemapb
.
CollectionSchema
{}
cct
.
schema
=
&
schemapb
.
CollectionSchema
{}
err
:=
proto
.
Unmarshal
(
cct
.
Schema
,
cct
.
schema
)
err
:=
proto
.
Unmarshal
(
cct
.
Schema
,
cct
.
schema
)
if
err
!=
nil
{
return
err
}
cct
.
schema
.
AutoID
=
false
cct
.
schema
.
AutoID
=
false
cct
.
CreateCollectionRequest
.
Schema
,
_
=
proto
.
Marshal
(
cct
.
schema
)
cct
.
CreateCollectionRequest
.
Schema
,
err
=
proto
.
Marshal
(
cct
.
schema
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
...
internal/proxy/task_test.go
浏览文件 @
5a3fc375
package
proxy
package
proxy
import
(
import
(
"fmt"
"strconv"
"testing"
"testing"
"github.com/golang/protobuf/proto"
"github.com/milvus-io/milvus/internal/proto/commonpb"
"github.com/milvus-io/milvus/internal/proto/milvuspb"
"github.com/milvus-io/milvus/internal/proto/milvuspb"
"github.com/milvus-io/milvus/internal/proto/schemapb"
"github.com/milvus-io/milvus/internal/proto/schemapb"
...
@@ -12,6 +17,70 @@ import (
...
@@ -12,6 +17,70 @@ import (
// TODO(dragondriver): add more test cases
// TODO(dragondriver): add more test cases
func
constructCollectionSchema
(
int64Field
,
floatVecField
string
,
dim
int
,
collectionName
string
,
)
*
schemapb
.
CollectionSchema
{
pk
:=
&
schemapb
.
FieldSchema
{
FieldID
:
0
,
Name
:
int64Field
,
IsPrimaryKey
:
true
,
Description
:
""
,
DataType
:
schemapb
.
DataType_Int64
,
TypeParams
:
nil
,
IndexParams
:
nil
,
AutoID
:
true
,
}
fVec
:=
&
schemapb
.
FieldSchema
{
FieldID
:
0
,
Name
:
floatVecField
,
IsPrimaryKey
:
false
,
Description
:
""
,
DataType
:
schemapb
.
DataType_FloatVector
,
TypeParams
:
[]
*
commonpb
.
KeyValuePair
{
{
Key
:
"dim"
,
Value
:
strconv
.
Itoa
(
dim
),
},
},
IndexParams
:
nil
,
AutoID
:
false
,
}
return
&
schemapb
.
CollectionSchema
{
Name
:
collectionName
,
Description
:
""
,
AutoID
:
false
,
Fields
:
[]
*
schemapb
.
FieldSchema
{
pk
,
fVec
,
},
}
}
func
constructCreateCollectionRequest
(
schema
*
schemapb
.
CollectionSchema
,
dbName
,
collectionName
string
,
shardsNum
int32
,
)
*
milvuspb
.
CreateCollectionRequest
{
bs
,
err
:=
proto
.
Marshal
(
schema
)
if
err
!=
nil
{
panic
(
fmt
.
Sprintf
(
"failed to marshal collection schema, schema: %v, error: %v"
,
schema
,
err
))
}
return
&
milvuspb
.
CreateCollectionRequest
{
Base
:
nil
,
DbName
:
dbName
,
CollectionName
:
collectionName
,
Schema
:
bs
,
ShardsNum
:
shardsNum
,
}
}
func
TestGetNumRowsOfScalarField
(
t
*
testing
.
T
)
{
func
TestGetNumRowsOfScalarField
(
t
*
testing
.
T
)
{
cases
:=
[]
struct
{
cases
:=
[]
struct
{
datas
interface
{}
datas
interface
{}
...
@@ -508,7 +577,3 @@ func TestTranslateOutputFields(t *testing.T) {
...
@@ -508,7 +577,3 @@ func TestTranslateOutputFields(t *testing.T) {
assert
.
Equal
(
t
,
nil
,
err
)
assert
.
Equal
(
t
,
nil
,
err
)
assert
.
ElementsMatch
(
t
,
[]
string
{
idFieldName
,
floatVectorFieldName
,
binaryVectorFieldName
},
outputFields
)
assert
.
ElementsMatch
(
t
,
[]
string
{
idFieldName
,
floatVectorFieldName
,
binaryVectorFieldName
},
outputFields
)
}
}
func
TestCreateCollectionTask
(
t
*
testing
.
T
)
{
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录