Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
251e9b38
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,发现更多精彩内容 >>
提交
251e9b38
编写于
9月 10, 2019
作者:
S
starlord
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix unitest failure
Former-commit-id: ed52c067ac2f4ca76e956f5f8afd3b8bda36bd9c
上级
08ed782a
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
55 addition
and
73 deletion
+55
-73
cpp/conf/server_config.template
cpp/conf/server_config.template
+0
-1
cpp/src/db/meta/MySQLMetaImpl.cpp
cpp/src/db/meta/MySQLMetaImpl.cpp
+21
-20
cpp/src/db/meta/SqliteMetaImpl.cpp
cpp/src/db/meta/SqliteMetaImpl.cpp
+20
-18
cpp/src/server/grpc_impl/GrpcRequestScheduler.cpp
cpp/src/server/grpc_impl/GrpcRequestScheduler.cpp
+10
-5
cpp/unittest/db/meta_tests.cpp
cpp/unittest/db/meta_tests.cpp
+2
-14
cpp/unittest/db/mysql_meta_test.cpp
cpp/unittest/db/mysql_meta_test.cpp
+2
-15
未找到文件。
cpp/conf/server_config.template
浏览文件 @
251e9b38
...
@@ -39,7 +39,6 @@ cache_config:
...
@@ -39,7 +39,6 @@ cache_config:
engine_config:
engine_config:
use_blas_threshold: 20
use_blas_threshold: 20
omp_thread_num: 0 # how many compute threads be used by engine, 0 means use all cpu core to compute
resource_config:
resource_config:
# resource list, length: 0~N
# resource list, length: 0~N
...
...
cpp/src/db/meta/MySQLMetaImpl.cpp
浏览文件 @
251e9b38
...
@@ -881,6 +881,7 @@ Status MySQLMetaImpl::FilesToIndex(TableFilesSchema &files) {
...
@@ -881,6 +881,7 @@ Status MySQLMetaImpl::FilesToIndex(TableFilesSchema &files) {
res
=
filesToIndexQuery
.
store
();
res
=
filesToIndexQuery
.
store
();
}
//Scoped Connection
}
//Scoped Connection
Status
ret
;
std
::
map
<
std
::
string
,
TableSchema
>
groups
;
std
::
map
<
std
::
string
,
TableSchema
>
groups
;
TableFileSchema
table_file
;
TableFileSchema
table_file
;
for
(
auto
&
resRow
:
res
)
{
for
(
auto
&
resRow
:
res
)
{
...
@@ -925,16 +926,17 @@ Status MySQLMetaImpl::FilesToIndex(TableFilesSchema &files) {
...
@@ -925,16 +926,17 @@ Status MySQLMetaImpl::FilesToIndex(TableFilesSchema &files) {
auto
status
=
utils
::
GetTableFilePath
(
options_
,
table_file
);
auto
status
=
utils
::
GetTableFilePath
(
options_
,
table_file
);
if
(
!
status
.
ok
())
{
if
(
!
status
.
ok
())
{
ret
urn
status
;
ret
=
status
;
}
}
files
.
push_back
(
table_file
);
files
.
push_back
(
table_file
);
}
}
return
ret
;
}
catch
(
std
::
exception
&
e
)
{
}
catch
(
std
::
exception
&
e
)
{
return
HandleException
(
"GENERAL ERROR WHEN FINDING TABLE FILES TO INDEX"
,
e
.
what
());
return
HandleException
(
"GENERAL ERROR WHEN FINDING TABLE FILES TO INDEX"
,
e
.
what
());
}
}
return
Status
::
OK
();
}
}
Status
MySQLMetaImpl
::
FilesToSearch
(
const
std
::
string
&
table_id
,
Status
MySQLMetaImpl
::
FilesToSearch
(
const
std
::
string
&
table_id
,
...
@@ -998,6 +1000,7 @@ Status MySQLMetaImpl::FilesToSearch(const std::string &table_id,
...
@@ -998,6 +1000,7 @@ Status MySQLMetaImpl::FilesToSearch(const std::string &table_id,
return
status
;
return
status
;
}
}
Status
ret
;
TableFileSchema
table_file
;
TableFileSchema
table_file
;
for
(
auto
&
resRow
:
res
)
{
for
(
auto
&
resRow
:
res
)
{
...
@@ -1031,7 +1034,7 @@ Status MySQLMetaImpl::FilesToSearch(const std::string &table_id,
...
@@ -1031,7 +1034,7 @@ Status MySQLMetaImpl::FilesToSearch(const std::string &table_id,
auto
status
=
utils
::
GetTableFilePath
(
options_
,
table_file
);
auto
status
=
utils
::
GetTableFilePath
(
options_
,
table_file
);
if
(
!
status
.
ok
())
{
if
(
!
status
.
ok
())
{
ret
urn
status
;
ret
=
status
;
}
}
auto
dateItr
=
files
.
find
(
table_file
.
date_
);
auto
dateItr
=
files
.
find
(
table_file
.
date_
);
...
@@ -1041,11 +1044,11 @@ Status MySQLMetaImpl::FilesToSearch(const std::string &table_id,
...
@@ -1041,11 +1044,11 @@ Status MySQLMetaImpl::FilesToSearch(const std::string &table_id,
files
[
table_file
.
date_
].
push_back
(
table_file
);
files
[
table_file
.
date_
].
push_back
(
table_file
);
}
}
return
ret
;
}
catch
(
std
::
exception
&
e
)
{
}
catch
(
std
::
exception
&
e
)
{
return
HandleException
(
"GENERAL ERROR WHEN FINDING TABLE FILES TO SEARCH"
,
e
.
what
());
return
HandleException
(
"GENERAL ERROR WHEN FINDING TABLE FILES TO SEARCH"
,
e
.
what
());
}
}
return
Status
::
OK
();
}
}
Status
MySQLMetaImpl
::
FilesToMerge
(
const
std
::
string
&
table_id
,
Status
MySQLMetaImpl
::
FilesToMerge
(
const
std
::
string
&
table_id
,
...
@@ -1083,6 +1086,7 @@ Status MySQLMetaImpl::FilesToMerge(const std::string &table_id,
...
@@ -1083,6 +1086,7 @@ Status MySQLMetaImpl::FilesToMerge(const std::string &table_id,
res
=
filesToMergeQuery
.
store
();
res
=
filesToMergeQuery
.
store
();
}
//Scoped Connection
}
//Scoped Connection
Status
ret
;
for
(
auto
&
resRow
:
res
)
{
for
(
auto
&
resRow
:
res
)
{
TableFileSchema
table_file
;
TableFileSchema
table_file
;
table_file
.
file_size_
=
resRow
[
"file_size"
];
table_file
.
file_size_
=
resRow
[
"file_size"
];
...
@@ -1120,7 +1124,7 @@ Status MySQLMetaImpl::FilesToMerge(const std::string &table_id,
...
@@ -1120,7 +1124,7 @@ Status MySQLMetaImpl::FilesToMerge(const std::string &table_id,
auto
status
=
utils
::
GetTableFilePath
(
options_
,
table_file
);
auto
status
=
utils
::
GetTableFilePath
(
options_
,
table_file
);
if
(
!
status
.
ok
())
{
if
(
!
status
.
ok
())
{
ret
urn
status
;
ret
=
status
;
}
}
auto
dateItr
=
files
.
find
(
table_file
.
date_
);
auto
dateItr
=
files
.
find
(
table_file
.
date_
);
...
@@ -1131,11 +1135,11 @@ Status MySQLMetaImpl::FilesToMerge(const std::string &table_id,
...
@@ -1131,11 +1135,11 @@ Status MySQLMetaImpl::FilesToMerge(const std::string &table_id,
files
[
table_file
.
date_
].
push_back
(
table_file
);
files
[
table_file
.
date_
].
push_back
(
table_file
);
}
}
return
ret
;
}
catch
(
std
::
exception
&
e
)
{
}
catch
(
std
::
exception
&
e
)
{
return
HandleException
(
"GENERAL ERROR WHEN FINDING TABLE FILES TO MERGE"
,
e
.
what
());
return
HandleException
(
"GENERAL ERROR WHEN FINDING TABLE FILES TO MERGE"
,
e
.
what
());
}
}
return
Status
::
OK
();
}
}
Status
MySQLMetaImpl
::
GetTableFiles
(
const
std
::
string
&
table_id
,
Status
MySQLMetaImpl
::
GetTableFiles
(
const
std
::
string
&
table_id
,
...
@@ -1165,7 +1169,8 @@ Status MySQLMetaImpl::GetTableFiles(const std::string &table_id,
...
@@ -1165,7 +1169,8 @@ Status MySQLMetaImpl::GetTableFiles(const std::string &table_id,
getTableFileQuery
<<
"SELECT id, engine_type, file_id, file_type, file_size, row_count, date, created_on "
<<
getTableFileQuery
<<
"SELECT id, engine_type, file_id, file_type, file_size, row_count, date, created_on "
<<
"FROM TableFiles "
<<
"FROM TableFiles "
<<
"WHERE table_id = "
<<
quote
<<
table_id
<<
" AND "
<<
"WHERE table_id = "
<<
quote
<<
table_id
<<
" AND "
<<
"("
<<
idStr
<<
");"
;
"("
<<
idStr
<<
") AND "
<<
"file_type <> "
<<
std
::
to_string
(
TableFileSchema
::
TO_DELETE
)
<<
";"
;
ENGINE_LOG_DEBUG
<<
"MySQLMetaImpl::GetTableFiles: "
<<
getTableFileQuery
.
str
();
ENGINE_LOG_DEBUG
<<
"MySQLMetaImpl::GetTableFiles: "
<<
getTableFileQuery
.
str
();
...
@@ -1174,11 +1179,9 @@ Status MySQLMetaImpl::GetTableFiles(const std::string &table_id,
...
@@ -1174,11 +1179,9 @@ Status MySQLMetaImpl::GetTableFiles(const std::string &table_id,
TableSchema
table_schema
;
TableSchema
table_schema
;
table_schema
.
table_id_
=
table_id
;
table_schema
.
table_id_
=
table_id
;
auto
status
=
DescribeTable
(
table_schema
);
DescribeTable
(
table_schema
);
if
(
!
status
.
ok
())
{
return
status
;
}
Status
ret
;
for
(
auto
&
resRow
:
res
)
{
for
(
auto
&
resRow
:
res
)
{
TableFileSchema
file_schema
;
TableFileSchema
file_schema
;
...
@@ -1211,18 +1214,16 @@ Status MySQLMetaImpl::GetTableFiles(const std::string &table_id,
...
@@ -1211,18 +1214,16 @@ Status MySQLMetaImpl::GetTableFiles(const std::string &table_id,
file_schema
.
dimension_
=
table_schema
.
dimension_
;
file_schema
.
dimension_
=
table_schema
.
dimension_
;
auto
status
=
utils
::
GetTableFilePath
(
options_
,
file_schema
);
utils
::
GetTableFilePath
(
options_
,
file_schema
);
if
(
!
status
.
ok
())
{
return
status
;
}
table_files
.
emplace_back
(
file_schema
);
table_files
.
emplace_back
(
file_schema
);
}
}
return
ret
;
}
catch
(
std
::
exception
&
e
)
{
}
catch
(
std
::
exception
&
e
)
{
return
HandleException
(
"GENERAL ERROR WHEN RETRIEVING TABLE FILES"
,
e
.
what
());
return
HandleException
(
"GENERAL ERROR WHEN RETRIEVING TABLE FILES"
,
e
.
what
());
}
}
return
Status
::
OK
();
}
}
// PXU TODO: Support Swap
// PXU TODO: Support Swap
...
...
cpp/src/db/meta/SqliteMetaImpl.cpp
浏览文件 @
251e9b38
...
@@ -603,6 +603,7 @@ Status SqliteMetaImpl::FilesToIndex(TableFilesSchema &files) {
...
@@ -603,6 +603,7 @@ Status SqliteMetaImpl::FilesToIndex(TableFilesSchema &files) {
std
::
map
<
std
::
string
,
TableSchema
>
groups
;
std
::
map
<
std
::
string
,
TableSchema
>
groups
;
TableFileSchema
table_file
;
TableFileSchema
table_file
;
Status
ret
;
for
(
auto
&
file
:
selected
)
{
for
(
auto
&
file
:
selected
)
{
table_file
.
id_
=
std
::
get
<
0
>
(
file
);
table_file
.
id_
=
std
::
get
<
0
>
(
file
);
table_file
.
table_id_
=
std
::
get
<
1
>
(
file
);
table_file
.
table_id_
=
std
::
get
<
1
>
(
file
);
...
@@ -616,7 +617,7 @@ Status SqliteMetaImpl::FilesToIndex(TableFilesSchema &files) {
...
@@ -616,7 +617,7 @@ Status SqliteMetaImpl::FilesToIndex(TableFilesSchema &files) {
auto
status
=
utils
::
GetTableFilePath
(
options_
,
table_file
);
auto
status
=
utils
::
GetTableFilePath
(
options_
,
table_file
);
if
(
!
status
.
ok
())
{
if
(
!
status
.
ok
())
{
ret
urn
status
;
ret
=
status
;
}
}
auto
groupItr
=
groups
.
find
(
table_file
.
table_id_
);
auto
groupItr
=
groups
.
find
(
table_file
.
table_id_
);
if
(
groupItr
==
groups
.
end
())
{
if
(
groupItr
==
groups
.
end
())
{
...
@@ -635,11 +636,11 @@ Status SqliteMetaImpl::FilesToIndex(TableFilesSchema &files) {
...
@@ -635,11 +636,11 @@ Status SqliteMetaImpl::FilesToIndex(TableFilesSchema &files) {
files
.
push_back
(
table_file
);
files
.
push_back
(
table_file
);
}
}
return
ret
;
}
catch
(
std
::
exception
&
e
)
{
}
catch
(
std
::
exception
&
e
)
{
return
HandleException
(
"Encounter exception when iterate raw files"
,
e
.
what
());
return
HandleException
(
"Encounter exception when iterate raw files"
,
e
.
what
());
}
}
return
Status
::
OK
();
}
}
Status
SqliteMetaImpl
::
FilesToSearch
(
const
std
::
string
&
table_id
,
Status
SqliteMetaImpl
::
FilesToSearch
(
const
std
::
string
&
table_id
,
...
@@ -695,6 +696,7 @@ Status SqliteMetaImpl::FilesToSearch(const std::string &table_id,
...
@@ -695,6 +696,7 @@ Status SqliteMetaImpl::FilesToSearch(const std::string &table_id,
result
=
ConnectorPtr
->
select
(
select_columns
,
filter
);
result
=
ConnectorPtr
->
select
(
select_columns
,
filter
);
}
}
Status
ret
;
TableFileSchema
table_file
;
TableFileSchema
table_file
;
for
(
auto
&
file
:
result
)
{
for
(
auto
&
file
:
result
)
{
table_file
.
id_
=
std
::
get
<
0
>
(
file
);
table_file
.
id_
=
std
::
get
<
0
>
(
file
);
...
@@ -712,7 +714,7 @@ Status SqliteMetaImpl::FilesToSearch(const std::string &table_id,
...
@@ -712,7 +714,7 @@ Status SqliteMetaImpl::FilesToSearch(const std::string &table_id,
auto
status
=
utils
::
GetTableFilePath
(
options_
,
table_file
);
auto
status
=
utils
::
GetTableFilePath
(
options_
,
table_file
);
if
(
!
status
.
ok
())
{
if
(
!
status
.
ok
())
{
ret
urn
status
;
ret
=
status
;
}
}
auto
dateItr
=
files
.
find
(
table_file
.
date_
);
auto
dateItr
=
files
.
find
(
table_file
.
date_
);
...
@@ -724,13 +726,12 @@ Status SqliteMetaImpl::FilesToSearch(const std::string &table_id,
...
@@ -724,13 +726,12 @@ Status SqliteMetaImpl::FilesToSearch(const std::string &table_id,
if
(
files
.
empty
())
{
if
(
files
.
empty
())
{
ENGINE_LOG_ERROR
<<
"No file to search for table: "
<<
table_id
;
ENGINE_LOG_ERROR
<<
"No file to search for table: "
<<
table_id
;
}
}
return
ret
;
}
catch
(
std
::
exception
&
e
)
{
}
catch
(
std
::
exception
&
e
)
{
return
HandleException
(
"Encounter exception when iterate index files"
,
e
.
what
());
return
HandleException
(
"Encounter exception when iterate index files"
,
e
.
what
());
}
}
return
Status
::
OK
();
}
}
Status
SqliteMetaImpl
::
FilesToMerge
(
const
std
::
string
&
table_id
,
Status
SqliteMetaImpl
::
FilesToMerge
(
const
std
::
string
&
table_id
,
...
@@ -761,6 +762,7 @@ Status SqliteMetaImpl::FilesToMerge(const std::string &table_id,
...
@@ -761,6 +762,7 @@ Status SqliteMetaImpl::FilesToMerge(const std::string &table_id,
c
(
&
TableFileSchema
::
table_id_
)
==
table_id
),
c
(
&
TableFileSchema
::
table_id_
)
==
table_id
),
order_by
(
&
TableFileSchema
::
file_size_
).
desc
());
order_by
(
&
TableFileSchema
::
file_size_
).
desc
());
Status
result
;
for
(
auto
&
file
:
selected
)
{
for
(
auto
&
file
:
selected
)
{
TableFileSchema
table_file
;
TableFileSchema
table_file
;
table_file
.
file_size_
=
std
::
get
<
4
>
(
file
);
table_file
.
file_size_
=
std
::
get
<
4
>
(
file
);
...
@@ -782,7 +784,7 @@ Status SqliteMetaImpl::FilesToMerge(const std::string &table_id,
...
@@ -782,7 +784,7 @@ Status SqliteMetaImpl::FilesToMerge(const std::string &table_id,
auto
status
=
utils
::
GetTableFilePath
(
options_
,
table_file
);
auto
status
=
utils
::
GetTableFilePath
(
options_
,
table_file
);
if
(
!
status
.
ok
())
{
if
(
!
status
.
ok
())
{
re
turn
status
;
re
sult
=
status
;
}
}
auto
dateItr
=
files
.
find
(
table_file
.
date_
);
auto
dateItr
=
files
.
find
(
table_file
.
date_
);
...
@@ -791,11 +793,12 @@ Status SqliteMetaImpl::FilesToMerge(const std::string &table_id,
...
@@ -791,11 +793,12 @@ Status SqliteMetaImpl::FilesToMerge(const std::string &table_id,
}
}
files
[
table_file
.
date_
].
push_back
(
table_file
);
files
[
table_file
.
date_
].
push_back
(
table_file
);
}
}
return
result
;
}
catch
(
std
::
exception
&
e
)
{
}
catch
(
std
::
exception
&
e
)
{
return
HandleException
(
"Encounter exception when iterate merge files"
,
e
.
what
());
return
HandleException
(
"Encounter exception when iterate merge files"
,
e
.
what
());
}
}
return
Status
::
OK
();
}
}
Status
SqliteMetaImpl
::
GetTableFiles
(
const
std
::
string
&
table_id
,
Status
SqliteMetaImpl
::
GetTableFiles
(
const
std
::
string
&
table_id
,
...
@@ -812,7 +815,8 @@ Status SqliteMetaImpl::GetTableFiles(const std::string& table_id,
...
@@ -812,7 +815,8 @@ Status SqliteMetaImpl::GetTableFiles(const std::string& table_id,
&
TableFileSchema
::
engine_type_
,
&
TableFileSchema
::
engine_type_
,
&
TableFileSchema
::
created_on_
),
&
TableFileSchema
::
created_on_
),
where
(
c
(
&
TableFileSchema
::
table_id_
)
==
table_id
and
where
(
c
(
&
TableFileSchema
::
table_id_
)
==
table_id
and
in
(
&
TableFileSchema
::
id_
,
ids
)
in
(
&
TableFileSchema
::
id_
,
ids
)
and
c
(
&
TableFileSchema
::
file_type_
)
!=
(
int
)
TableFileSchema
::
TO_DELETE
));
));
TableSchema
table_schema
;
TableSchema
table_schema
;
...
@@ -822,6 +826,7 @@ Status SqliteMetaImpl::GetTableFiles(const std::string& table_id,
...
@@ -822,6 +826,7 @@ Status SqliteMetaImpl::GetTableFiles(const std::string& table_id,
return
status
;
return
status
;
}
}
Status
result
;
for
(
auto
&
file
:
files
)
{
for
(
auto
&
file
:
files
)
{
TableFileSchema
file_schema
;
TableFileSchema
file_schema
;
file_schema
.
table_id_
=
table_id
;
file_schema
.
table_id_
=
table_id
;
...
@@ -838,18 +843,15 @@ Status SqliteMetaImpl::GetTableFiles(const std::string& table_id,
...
@@ -838,18 +843,15 @@ Status SqliteMetaImpl::GetTableFiles(const std::string& table_id,
file_schema
.
nlist_
=
table_schema
.
nlist_
;
file_schema
.
nlist_
=
table_schema
.
nlist_
;
file_schema
.
metric_type_
=
table_schema
.
metric_type_
;
file_schema
.
metric_type_
=
table_schema
.
metric_type_
;
auto
status
=
utils
::
GetTableFilePath
(
options_
,
file_schema
);
utils
::
GetTableFilePath
(
options_
,
file_schema
);
if
(
!
status
.
ok
())
{
return
status
;
}
table_files
.
emplace_back
(
file_schema
);
table_files
.
emplace_back
(
file_schema
);
}
}
return
result
;
}
catch
(
std
::
exception
&
e
)
{
}
catch
(
std
::
exception
&
e
)
{
return
HandleException
(
"Encounter exception when lookup table files"
,
e
.
what
());
return
HandleException
(
"Encounter exception when lookup table files"
,
e
.
what
());
}
}
return
Status
::
OK
();
}
}
// PXU TODO: Support Swap
// PXU TODO: Support Swap
...
...
cpp/src/server/grpc_impl/GrpcRequestScheduler.cpp
浏览文件 @
251e9b38
...
@@ -16,7 +16,7 @@ namespace grpc {
...
@@ -16,7 +16,7 @@ namespace grpc {
using
namespace
::
milvus
;
using
namespace
::
milvus
;
namespace
{
namespace
{
const
std
::
map
<
ErrorCode
,
::
milvus
::
grpc
::
ErrorCode
>
&
ErrorMap
(
)
{
::
milvus
::
grpc
::
ErrorCode
ErrorMap
(
ErrorCode
code
)
{
static
const
std
::
map
<
ErrorCode
,
::
milvus
::
grpc
::
ErrorCode
>
code_map
=
{
static
const
std
::
map
<
ErrorCode
,
::
milvus
::
grpc
::
ErrorCode
>
code_map
=
{
{
SERVER_UNEXPECTED_ERROR
,
::
milvus
::
grpc
::
ErrorCode
::
UNEXPECTED_ERROR
},
{
SERVER_UNEXPECTED_ERROR
,
::
milvus
::
grpc
::
ErrorCode
::
UNEXPECTED_ERROR
},
{
SERVER_UNSUPPORTED_ERROR
,
::
milvus
::
grpc
::
ErrorCode
::
UNEXPECTED_ERROR
},
{
SERVER_UNSUPPORTED_ERROR
,
::
milvus
::
grpc
::
ErrorCode
::
UNEXPECTED_ERROR
},
...
@@ -40,8 +40,9 @@ namespace {
...
@@ -40,8 +40,9 @@ namespace {
{
SERVER_INVALID_ROWRECORD_ARRAY
,
::
milvus
::
grpc
::
ErrorCode
::
ILLEGAL_ROWRECORD
},
{
SERVER_INVALID_ROWRECORD_ARRAY
,
::
milvus
::
grpc
::
ErrorCode
::
ILLEGAL_ROWRECORD
},
{
SERVER_INVALID_TOPK
,
::
milvus
::
grpc
::
ErrorCode
::
ILLEGAL_TOPK
},
{
SERVER_INVALID_TOPK
,
::
milvus
::
grpc
::
ErrorCode
::
ILLEGAL_TOPK
},
{
SERVER_INVALID_NPROBE
,
::
milvus
::
grpc
::
ErrorCode
::
ILLEGAL_ARGUMENT
},
{
SERVER_INVALID_NPROBE
,
::
milvus
::
grpc
::
ErrorCode
::
ILLEGAL_ARGUMENT
},
{
SERVER_INVALID_INDEX_NLIST
,
::
milvus
::
grpc
::
ErrorCode
::
ILLEGAL_ARGUMENT
},
{
SERVER_INVALID_INDEX_NLIST
,
::
milvus
::
grpc
::
ErrorCode
::
ILLEGAL_NLIST
},
{
SERVER_INVALID_INDEX_METRIC_TYPE
,
::
milvus
::
grpc
::
ErrorCode
::
ILLEGAL_ARGUMENT
},
{
SERVER_INVALID_INDEX_METRIC_TYPE
,
::
milvus
::
grpc
::
ErrorCode
::
ILLEGAL_METRIC_TYPE
},
{
SERVER_INVALID_INDEX_FILE_SIZE
,
::
milvus
::
grpc
::
ErrorCode
::
ILLEGAL_ARGUMENT
},
{
SERVER_ILLEGAL_VECTOR_ID
,
::
milvus
::
grpc
::
ErrorCode
::
ILLEGAL_VECTOR_ID
},
{
SERVER_ILLEGAL_VECTOR_ID
,
::
milvus
::
grpc
::
ErrorCode
::
ILLEGAL_VECTOR_ID
},
{
SERVER_ILLEGAL_SEARCH_RESULT
,
::
milvus
::
grpc
::
ErrorCode
::
ILLEGAL_SEARCH_RESULT
},
{
SERVER_ILLEGAL_SEARCH_RESULT
,
::
milvus
::
grpc
::
ErrorCode
::
ILLEGAL_SEARCH_RESULT
},
{
SERVER_CACHE_ERROR
,
::
milvus
::
grpc
::
ErrorCode
::
CACHE_FAILED
},
{
SERVER_CACHE_ERROR
,
::
milvus
::
grpc
::
ErrorCode
::
CACHE_FAILED
},
...
@@ -49,7 +50,11 @@ namespace {
...
@@ -49,7 +50,11 @@ namespace {
{
SERVER_BUILD_INDEX_ERROR
,
::
milvus
::
grpc
::
ErrorCode
::
BUILD_INDEX_ERROR
},
{
SERVER_BUILD_INDEX_ERROR
,
::
milvus
::
grpc
::
ErrorCode
::
BUILD_INDEX_ERROR
},
};
};
return
code_map
;
if
(
code_map
.
find
(
code
)
!=
code_map
.
end
())
{
return
code_map
.
at
(
code
);
}
else
{
return
::
milvus
::
grpc
::
ErrorCode
::
UNEXPECTED_ERROR
;
}
}
}
}
}
...
@@ -115,7 +120,7 @@ void GrpcRequestScheduler::ExecTask(BaseTaskPtr &task_ptr, ::milvus::grpc::Statu
...
@@ -115,7 +120,7 @@ void GrpcRequestScheduler::ExecTask(BaseTaskPtr &task_ptr, ::milvus::grpc::Statu
ErrorCode
err
=
task_ptr
->
ErrorID
();
ErrorCode
err
=
task_ptr
->
ErrorID
();
if
(
err
!=
SERVER_SUCCESS
)
{
if
(
err
!=
SERVER_SUCCESS
)
{
grpc_status
->
set_reason
(
task_ptr
->
ErrorMsg
());
grpc_status
->
set_reason
(
task_ptr
->
ErrorMsg
());
grpc_status
->
set_error_code
(
ErrorMap
(
).
at
(
err
));
grpc_status
->
set_error_code
(
ErrorMap
(
err
));
}
}
}
}
}
}
...
...
cpp/unittest/db/meta_tests.cpp
浏览文件 @
251e9b38
...
@@ -101,8 +101,7 @@ TEST_F(MetaTest, TABLE_FILE_TEST) {
...
@@ -101,8 +101,7 @@ TEST_F(MetaTest, TABLE_FILE_TEST) {
meta
::
TableFilesSchema
files
;
meta
::
TableFilesSchema
files
;
status
=
impl_
->
GetTableFiles
(
table_file
.
table_id_
,
ids
,
files
);
status
=
impl_
->
GetTableFiles
(
table_file
.
table_id_
,
ids
,
files
);
ASSERT_TRUE
(
status
.
ok
());
ASSERT_TRUE
(
status
.
ok
());
ASSERT_EQ
(
files
.
size
(),
1UL
);
ASSERT_EQ
(
files
.
size
(),
0UL
);
ASSERT_TRUE
(
files
[
0
].
file_type_
==
meta
::
TableFileSchema
::
TO_DELETE
);
}
}
TEST_F
(
MetaTest
,
ARCHIVE_TEST_DAYS
)
{
TEST_F
(
MetaTest
,
ARCHIVE_TEST_DAYS
)
{
...
@@ -150,8 +149,6 @@ TEST_F(MetaTest, ARCHIVE_TEST_DAYS) {
...
@@ -150,8 +149,6 @@ TEST_F(MetaTest, ARCHIVE_TEST_DAYS) {
for
(
auto
&
file
:
files_get
)
{
for
(
auto
&
file
:
files_get
)
{
if
(
days
[
i
]
<
days_num
)
{
if
(
days
[
i
]
<
days_num
)
{
ASSERT_EQ
(
file
.
file_type_
,
meta
::
TableFileSchema
::
NEW
);
ASSERT_EQ
(
file
.
file_type_
,
meta
::
TableFileSchema
::
NEW
);
}
else
{
ASSERT_EQ
(
file
.
file_type_
,
meta
::
TableFileSchema
::
TO_DELETE
);
}
}
i
++
;
i
++
;
}
}
...
@@ -195,9 +192,7 @@ TEST_F(MetaTest, ARCHIVE_TEST_DISK) {
...
@@ -195,9 +192,7 @@ TEST_F(MetaTest, ARCHIVE_TEST_DISK) {
ASSERT_TRUE
(
status
.
ok
());
ASSERT_TRUE
(
status
.
ok
());
for
(
auto
&
file
:
files_get
)
{
for
(
auto
&
file
:
files_get
)
{
if
(
i
<
5
)
{
if
(
i
>=
5
)
{
ASSERT_TRUE
(
file
.
file_type_
==
meta
::
TableFileSchema
::
TO_DELETE
);
}
else
{
ASSERT_EQ
(
file
.
file_type_
,
meta
::
TableFileSchema
::
NEW
);
ASSERT_EQ
(
file
.
file_type_
,
meta
::
TableFileSchema
::
NEW
);
}
}
++
i
;
++
i
;
...
@@ -277,38 +272,31 @@ TEST_F(MetaTest, TABLE_FILES_TEST) {
...
@@ -277,38 +272,31 @@ TEST_F(MetaTest, TABLE_FILES_TEST) {
meta
::
TableFilesSchema
files
;
meta
::
TableFilesSchema
files
;
status
=
impl_
->
FilesToIndex
(
files
);
status
=
impl_
->
FilesToIndex
(
files
);
ASSERT_TRUE
(
status
.
ok
());
ASSERT_EQ
(
files
.
size
(),
to_index_files_cnt
);
ASSERT_EQ
(
files
.
size
(),
to_index_files_cnt
);
meta
::
DatePartionedTableFilesSchema
dated_files
;
meta
::
DatePartionedTableFilesSchema
dated_files
;
status
=
impl_
->
FilesToMerge
(
table
.
table_id_
,
dated_files
);
status
=
impl_
->
FilesToMerge
(
table
.
table_id_
,
dated_files
);
ASSERT_TRUE
(
status
.
ok
());
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
raw_files_cnt
);
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
raw_files_cnt
);
status
=
impl_
->
FilesToIndex
(
files
);
status
=
impl_
->
FilesToIndex
(
files
);
ASSERT_TRUE
(
status
.
ok
());
ASSERT_EQ
(
files
.
size
(),
to_index_files_cnt
);
ASSERT_EQ
(
files
.
size
(),
to_index_files_cnt
);
meta
::
DatesT
dates
=
{
table_file
.
date_
};
meta
::
DatesT
dates
=
{
table_file
.
date_
};
std
::
vector
<
size_t
>
ids
;
std
::
vector
<
size_t
>
ids
;
status
=
impl_
->
FilesToSearch
(
table_id
,
ids
,
dates
,
dated_files
);
status
=
impl_
->
FilesToSearch
(
table_id
,
ids
,
dates
,
dated_files
);
ASSERT_TRUE
(
status
.
ok
());
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
to_index_files_cnt
+
raw_files_cnt
+
index_files_cnt
);
to_index_files_cnt
+
raw_files_cnt
+
index_files_cnt
);
status
=
impl_
->
FilesToSearch
(
table_id
,
ids
,
meta
::
DatesT
(),
dated_files
);
status
=
impl_
->
FilesToSearch
(
table_id
,
ids
,
meta
::
DatesT
(),
dated_files
);
ASSERT_TRUE
(
status
.
ok
());
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
to_index_files_cnt
+
raw_files_cnt
+
index_files_cnt
);
to_index_files_cnt
+
raw_files_cnt
+
index_files_cnt
);
status
=
impl_
->
FilesToSearch
(
table_id
,
ids
,
meta
::
DatesT
(),
dated_files
);
status
=
impl_
->
FilesToSearch
(
table_id
,
ids
,
meta
::
DatesT
(),
dated_files
);
ASSERT_TRUE
(
status
.
ok
());
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
to_index_files_cnt
+
raw_files_cnt
+
index_files_cnt
);
to_index_files_cnt
+
raw_files_cnt
+
index_files_cnt
);
ids
.
push_back
(
size_t
(
9999999999
));
ids
.
push_back
(
size_t
(
9999999999
));
status
=
impl_
->
FilesToSearch
(
table_id
,
ids
,
dates
,
dated_files
);
status
=
impl_
->
FilesToSearch
(
table_id
,
ids
,
dates
,
dated_files
);
ASSERT_TRUE
(
status
.
ok
());
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
0
);
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
0
);
std
::
vector
<
int
>
file_types
;
std
::
vector
<
int
>
file_types
;
...
...
cpp/unittest/db/mysql_meta_test.cpp
浏览文件 @
251e9b38
...
@@ -108,9 +108,7 @@ TEST_F(MySqlMetaTest, TABLE_FILE_TEST) {
...
@@ -108,9 +108,7 @@ TEST_F(MySqlMetaTest, TABLE_FILE_TEST) {
std
::
vector
<
size_t
>
ids
=
{
table_file
.
id_
};
std
::
vector
<
size_t
>
ids
=
{
table_file
.
id_
};
meta
::
TableFilesSchema
files
;
meta
::
TableFilesSchema
files
;
status
=
impl_
->
GetTableFiles
(
table_file
.
table_id_
,
ids
,
files
);
status
=
impl_
->
GetTableFiles
(
table_file
.
table_id_
,
ids
,
files
);
ASSERT_TRUE
(
status
.
ok
());
ASSERT_EQ
(
files
.
size
(),
0UL
);
ASSERT_EQ
(
files
.
size
(),
1UL
);
ASSERT_TRUE
(
files
[
0
].
file_type_
==
meta
::
TableFileSchema
::
TO_DELETE
);
}
}
TEST_F
(
MySqlMetaTest
,
ARCHIVE_TEST_DAYS
)
{
TEST_F
(
MySqlMetaTest
,
ARCHIVE_TEST_DAYS
)
{
...
@@ -159,8 +157,6 @@ TEST_F(MySqlMetaTest, ARCHIVE_TEST_DAYS) {
...
@@ -159,8 +157,6 @@ TEST_F(MySqlMetaTest, ARCHIVE_TEST_DAYS) {
for
(
auto
&
file
:
files_get
)
{
for
(
auto
&
file
:
files_get
)
{
if
(
days
[
i
]
<
days_num
)
{
if
(
days
[
i
]
<
days_num
)
{
ASSERT_EQ
(
file
.
file_type_
,
meta
::
TableFileSchema
::
NEW
);
ASSERT_EQ
(
file
.
file_type_
,
meta
::
TableFileSchema
::
NEW
);
}
else
{
ASSERT_EQ
(
file
.
file_type_
,
meta
::
TableFileSchema
::
TO_DELETE
);
}
}
i
++
;
i
++
;
}
}
...
@@ -219,9 +215,7 @@ TEST_F(MySqlMetaTest, ARCHIVE_TEST_DISK) {
...
@@ -219,9 +215,7 @@ TEST_F(MySqlMetaTest, ARCHIVE_TEST_DISK) {
ASSERT_TRUE
(
status
.
ok
());
ASSERT_TRUE
(
status
.
ok
());
for
(
auto
&
file
:
files_get
)
{
for
(
auto
&
file
:
files_get
)
{
if
(
i
<
5
)
{
if
(
i
>=
5
)
{
ASSERT_TRUE
(
file
.
file_type_
==
meta
::
TableFileSchema
::
TO_DELETE
);
}
else
{
ASSERT_EQ
(
file
.
file_type_
,
meta
::
TableFileSchema
::
NEW
);
ASSERT_EQ
(
file
.
file_type_
,
meta
::
TableFileSchema
::
NEW
);
}
}
++
i
;
++
i
;
...
@@ -302,38 +296,31 @@ TEST_F(MySqlMetaTest, TABLE_FILES_TEST) {
...
@@ -302,38 +296,31 @@ TEST_F(MySqlMetaTest, TABLE_FILES_TEST) {
meta
::
TableFilesSchema
files
;
meta
::
TableFilesSchema
files
;
status
=
impl_
->
FilesToIndex
(
files
);
status
=
impl_
->
FilesToIndex
(
files
);
ASSERT_TRUE
(
status
.
ok
());
ASSERT_EQ
(
files
.
size
(),
to_index_files_cnt
);
ASSERT_EQ
(
files
.
size
(),
to_index_files_cnt
);
meta
::
DatePartionedTableFilesSchema
dated_files
;
meta
::
DatePartionedTableFilesSchema
dated_files
;
status
=
impl_
->
FilesToMerge
(
table
.
table_id_
,
dated_files
);
status
=
impl_
->
FilesToMerge
(
table
.
table_id_
,
dated_files
);
ASSERT_TRUE
(
status
.
ok
());
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
raw_files_cnt
);
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
raw_files_cnt
);
status
=
impl_
->
FilesToIndex
(
files
);
status
=
impl_
->
FilesToIndex
(
files
);
ASSERT_TRUE
(
status
.
ok
());
ASSERT_EQ
(
files
.
size
(),
to_index_files_cnt
);
ASSERT_EQ
(
files
.
size
(),
to_index_files_cnt
);
meta
::
DatesT
dates
=
{
table_file
.
date_
};
meta
::
DatesT
dates
=
{
table_file
.
date_
};
std
::
vector
<
size_t
>
ids
;
std
::
vector
<
size_t
>
ids
;
status
=
impl_
->
FilesToSearch
(
table_id
,
ids
,
dates
,
dated_files
);
status
=
impl_
->
FilesToSearch
(
table_id
,
ids
,
dates
,
dated_files
);
ASSERT_TRUE
(
status
.
ok
());
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
to_index_files_cnt
+
raw_files_cnt
+
index_files_cnt
);
to_index_files_cnt
+
raw_files_cnt
+
index_files_cnt
);
status
=
impl_
->
FilesToSearch
(
table_id
,
ids
,
meta
::
DatesT
(),
dated_files
);
status
=
impl_
->
FilesToSearch
(
table_id
,
ids
,
meta
::
DatesT
(),
dated_files
);
ASSERT_TRUE
(
status
.
ok
());
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
to_index_files_cnt
+
raw_files_cnt
+
index_files_cnt
);
to_index_files_cnt
+
raw_files_cnt
+
index_files_cnt
);
status
=
impl_
->
FilesToSearch
(
table_id
,
ids
,
meta
::
DatesT
(),
dated_files
);
status
=
impl_
->
FilesToSearch
(
table_id
,
ids
,
meta
::
DatesT
(),
dated_files
);
ASSERT_TRUE
(
status
.
ok
());
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
to_index_files_cnt
+
raw_files_cnt
+
index_files_cnt
);
to_index_files_cnt
+
raw_files_cnt
+
index_files_cnt
);
ids
.
push_back
(
size_t
(
9999999999
));
ids
.
push_back
(
size_t
(
9999999999
));
status
=
impl_
->
FilesToSearch
(
table_id
,
ids
,
dates
,
dated_files
);
status
=
impl_
->
FilesToSearch
(
table_id
,
ids
,
dates
,
dated_files
);
ASSERT_TRUE
(
status
.
ok
());
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
0
);
ASSERT_EQ
(
dated_files
[
table_file
.
date_
].
size
(),
0
);
std
::
vector
<
int
>
file_types
;
std
::
vector
<
int
>
file_types
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录