Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
8afab6dd
milvus
项目概览
BaiXuePrincess
/
milvus
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
4
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8afab6dd
编写于
7月 29, 2019
作者:
K
kun yu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix search error handle bug
Former-commit-id: aa7c821e2ea596a82222e0b59d91966e35d3cd95
上级
c51470ee
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
11 deletion
+29
-11
cpp/src/sdk/examples/grpcsimple/src/ClientTest.cpp
cpp/src/sdk/examples/grpcsimple/src/ClientTest.cpp
+2
-6
cpp/src/server/grpc_impl/RequestHandler.cpp
cpp/src/server/grpc_impl/RequestHandler.cpp
+16
-4
cpp/src/server/grpc_impl/RequestTask.cpp
cpp/src/server/grpc_impl/RequestTask.cpp
+11
-1
未找到文件。
cpp/src/sdk/examples/grpcsimple/src/ClientTest.cpp
浏览文件 @
8afab6dd
...
...
@@ -174,7 +174,7 @@ namespace {
std
::
vector
<
TopKQueryResult
>
topk_query_result_array
;
{
TimeRecorder
rc
(
phase_name
);
Status
stat
=
conn
->
SearchVector
(
TABLE_NAME
,
record_array
,
query_range_array
,
TOP_K
,
topk_query_result_array
);
Status
stat
=
conn
->
SearchVector
(
"qqq"
,
record_array
,
query_range_array
,
TOP_K
,
topk_query_result_array
);
std
::
cout
<<
"SearchVector function call status: "
<<
stat
.
ToString
()
<<
std
::
endl
;
}
...
...
@@ -244,11 +244,7 @@ ClientTest::Test(const std::string& address, const std::string& port) {
auto
start
=
std
::
chrono
::
high_resolution_clock
::
now
();
std
::
vector
<
RowRecord
>
null_record
;
RowRecord
rowRecord
;
rowRecord
.
data
.
resize
(
0
);
null_record
.
push_back
(
rowRecord
);
Status
stat
=
conn
->
InsertVector
(
TABLE_NAME
,
null_record
,
record_ids
);
Status
stat
=
conn
->
InsertVector
(
TABLE_NAME
,
record_array
,
record_ids
);
auto
finish
=
std
::
chrono
::
high_resolution_clock
::
now
();
std
::
cout
<<
"InsertVector cost: "
<<
std
::
chrono
::
duration_cast
<
std
::
chrono
::
duration
<
double
>>
(
finish
-
start
).
count
()
<<
"s
\n
"
;
...
...
cpp/src/server/grpc_impl/RequestHandler.cpp
浏览文件 @
8afab6dd
...
...
@@ -59,8 +59,14 @@ RequestHandler::InsertVector(::grpc::ServerContext* context, const ::milvus::grp
RequestHandler
::
SearchVector
(
::
grpc
::
ServerContext
*
context
,
const
::
milvus
::
grpc
::
SearchVectorInfos
*
request
,
::
grpc
::
ServerWriter
<::
milvus
::
grpc
::
TopKQueryResult
>*
writer
)
{
std
::
vector
<
std
::
string
>
file_id_array
;
BaseTaskPtr
task_ptr
=
SearchVectorTask
::
Create
(
*
request
,
file_id_array
,
*
writer
);
RequestScheduler
::
ExecTask
(
task_ptr
,
nullptr
);
return
::
grpc
::
Status
::
OK
;
::
milvus
::
grpc
::
Status
grpc_status
;
RequestScheduler
::
ExecTask
(
task_ptr
,
&
grpc_status
);
if
(
grpc_status
.
error_code
()
!=
SERVER_SUCCESS
)
{
::
grpc
::
Status
status
(
::
grpc
::
INVALID_ARGUMENT
,
grpc_status
.
reason
());
return
status
;
}
else
{
return
::
grpc
::
Status
::
OK
;
}
}
::
grpc
::
Status
...
...
@@ -96,8 +102,14 @@ RequestHandler::GetTableRowCount(::grpc::ServerContext* context, const ::milvus:
::
grpc
::
Status
RequestHandler
::
ShowTables
(
::
grpc
::
ServerContext
*
context
,
const
::
milvus
::
grpc
::
Command
*
request
,
::
grpc
::
ServerWriter
<
::
milvus
::
grpc
::
TableName
>*
writer
)
{
BaseTaskPtr
task_ptr
=
ShowTablesTask
::
Create
(
*
writer
);
RequestScheduler
::
ExecTask
(
task_ptr
,
nullptr
);
return
::
grpc
::
Status
::
OK
;
::
milvus
::
grpc
::
Status
grpc_status
;
RequestScheduler
::
ExecTask
(
task_ptr
,
&
grpc_status
);
if
(
grpc_status
.
error_code
()
!=
SERVER_SUCCESS
)
{
::
grpc
::
Status
status
(
::
grpc
::
UNKNOWN
,
grpc_status
.
reason
());
return
status
;
}
else
{
return
::
grpc
::
Status
::
OK
;
}
}
::
grpc
::
Status
...
...
cpp/src/server/grpc_impl/RequestTask.cpp
浏览文件 @
8afab6dd
...
...
@@ -486,7 +486,7 @@ ServerError SearchVectorTask::OnExecute() {
int
top_k_
=
search_vector_infos_
.
topk
();
if
(
top_k_
<=
0
)
{
if
(
top_k_
<=
0
||
top_k_
>
1024
)
{
return
SetError
(
SERVER_INVALID_TOPK
,
"Invalid topk: "
+
std
::
to_string
(
top_k_
));
}
...
...
@@ -535,6 +535,16 @@ ServerError SearchVectorTask::OnExecute() {
//TODO
for
(
size_t
i
=
0
;
i
<
record_array_size
;
i
++
)
{
for
(
size_t
j
=
0
;
j
<
table_info
.
dimension_
;
j
++
)
{
if
(
search_vector_infos_
.
query_record_array
(
i
).
vector_data
().
empty
())
{
return
SetError
(
SERVER_INVALID_ROWRECORD_ARRAY
,
"Query record float array is empty"
);
}
uint64_t
query_vec_dim
=
search_vector_infos_
.
query_record_array
(
i
).
vector_data
().
size
();
if
(
query_vec_dim
!=
table_info
.
dimension_
)
{
ServerError
error_code
=
SERVER_INVALID_VECTOR_DIMENSION
;
std
::
string
error_msg
=
"Invalid rowrecord dimension: "
+
std
::
to_string
(
query_vec_dim
)
+
" vs. table dimension:"
+
std
::
to_string
(
table_info
.
dimension_
);
return
SetError
(
error_code
,
error_msg
);
}
vec_f
[
i
*
table_info
.
dimension_
+
j
]
=
search_vector_infos_
.
query_record_array
(
i
).
vector_data
(
j
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录