Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
9899cfef
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,发现更多精彩内容 >>
未验证
提交
9899cfef
编写于
3月 05, 2020
作者:
J
Jin Hai
提交者:
GitHub
3月 05, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#1475 add debug timing for map uids (#1513)
Signed-off-by:
N
yudong.cai
<
yudong.cai@zilliz.com
>
上级
fc8a6e07
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
23 addition
and
28 deletion
+23
-28
core/src/db/engine/ExecutionEngineImpl.cpp
core/src/db/engine/ExecutionEngineImpl.cpp
+23
-28
未找到文件。
core/src/db/engine/ExecutionEngineImpl.cpp
浏览文件 @
9899cfef
...
...
@@ -741,6 +741,17 @@ ExecutionEngineImpl::BuildIndex(const std::string& location, EngineType engine_t
return
std
::
make_shared
<
ExecutionEngineImpl
>
(
to_index
,
location
,
engine_type
,
metric_type_
,
nlist_
);
}
// map offsets to ids
void
MapUids
(
const
std
::
vector
<
segment
::
doc_id_t
>&
uids
,
int64_t
*
labels
,
size_t
num
)
{
for
(
int64_t
i
=
0
;
i
<
num
;
++
i
)
{
int64_t
&
offset
=
labels
[
i
];
if
(
offset
!=
-
1
)
{
offset
=
uids
[
offset
];
}
}
}
Status
ExecutionEngineImpl
::
Search
(
int64_t
n
,
const
float
*
data
,
int64_t
k
,
int64_t
nprobe
,
float
*
distances
,
int64_t
*
labels
,
bool
hybrid
)
{
...
...
@@ -798,14 +809,14 @@ ExecutionEngineImpl::Search(int64_t n, const float* data, int64_t k, int64_t npr
}
}
#endif
TimeRecorder
rc
(
"ExecutionEngineImpl::Search"
);
TimeRecorder
rc
(
"ExecutionEngineImpl::Search
float
"
);
if
(
index_
==
nullptr
)
{
ENGINE_LOG_ERROR
<<
"ExecutionEngineImpl: index is null, failed to search"
;
return
Status
(
DB_ERROR
,
"index is null"
);
}
ENGINE_LOG_DEBUG
<<
"Search Params: [k]
"
<<
k
<<
" [nprobe] "
<<
nprobe
;
ENGINE_LOG_DEBUG
<<
"Search Params: [k] "
<<
k
<<
" [nprobe] "
<<
nprobe
;
// TODO(linxj): remove here. Get conf from function
TempMetaConf
temp_conf
;
...
...
@@ -824,15 +835,9 @@ ExecutionEngineImpl::Search(int64_t n, const float* data, int64_t k, int64_t npr
rc
.
RecordSection
(
"search done"
);
// map offsets to ids
const
std
::
vector
<
segment
::
doc_id_t
>&
uids
=
index_
->
GetUids
();
for
(
int64_t
i
=
0
;
i
<
n
*
k
;
i
++
)
{
int64_t
offset
=
labels
[
i
];
if
(
offset
!=
-
1
)
{
labels
[
i
]
=
uids
[
offset
];
}
}
MapUids
(
index_
->
GetUids
(),
labels
,
n
*
k
);
rc
.
RecordSection
(
"map uids
"
);
rc
.
RecordSection
(
"map uids
"
+
std
::
to_string
(
n
*
k
)
);
if
(
hybrid
)
{
HybridUnset
();
...
...
@@ -847,7 +852,7 @@ ExecutionEngineImpl::Search(int64_t n, const float* data, int64_t k, int64_t npr
Status
ExecutionEngineImpl
::
Search
(
int64_t
n
,
const
uint8_t
*
data
,
int64_t
k
,
int64_t
nprobe
,
float
*
distances
,
int64_t
*
labels
,
bool
hybrid
)
{
TimeRecorder
rc
(
"ExecutionEngineImpl::Search"
);
TimeRecorder
rc
(
"ExecutionEngineImpl::Search
uint8
"
);
if
(
index_
==
nullptr
)
{
ENGINE_LOG_ERROR
<<
"ExecutionEngineImpl: index is null, failed to search"
;
...
...
@@ -873,15 +878,9 @@ ExecutionEngineImpl::Search(int64_t n, const uint8_t* data, int64_t k, int64_t n
rc
.
RecordSection
(
"search done"
);
// map offsets to ids
const
std
::
vector
<
segment
::
doc_id_t
>&
uids
=
index_
->
GetUids
();
for
(
int64_t
i
=
0
;
i
<
n
*
k
;
i
++
)
{
int64_t
offset
=
labels
[
i
];
if
(
offset
!=
-
1
)
{
labels
[
i
]
=
uids
[
offset
];
}
}
MapUids
(
index_
->
GetUids
(),
labels
,
n
*
k
);
rc
.
RecordSection
(
"map uids
"
);
rc
.
RecordSection
(
"map uids
"
+
std
::
to_string
(
n
*
k
)
);
if
(
hybrid
)
{
HybridUnset
();
...
...
@@ -896,7 +895,7 @@ ExecutionEngineImpl::Search(int64_t n, const uint8_t* data, int64_t k, int64_t n
Status
ExecutionEngineImpl
::
Search
(
int64_t
n
,
const
std
::
vector
<
int64_t
>&
ids
,
int64_t
k
,
int64_t
nprobe
,
float
*
distances
,
int64_t
*
labels
,
bool
hybrid
)
{
TimeRecorder
rc
(
"ExecutionEngineImpl::Search"
);
TimeRecorder
rc
(
"ExecutionEngineImpl::Search
vector of ids
"
);
if
(
index_
==
nullptr
)
{
ENGINE_LOG_ERROR
<<
"ExecutionEngineImpl: index is null, failed to search"
;
...
...
@@ -961,16 +960,12 @@ ExecutionEngineImpl::Search(int64_t n, const std::vector<int64_t>& ids, int64_t
auto
status
=
Status
::
OK
();
if
(
!
offsets
.
empty
())
{
status
=
index_
->
SearchById
(
offsets
.
size
(),
offsets
.
data
(),
distances
,
labels
,
conf
);
rc
.
RecordSection
(
"search
by id
done"
);
rc
.
RecordSection
(
"search done"
);
// map offsets to ids
for
(
int64_t
i
=
0
;
i
<
offsets
.
size
()
*
k
;
i
++
)
{
int64_t
offset
=
labels
[
i
];
if
(
offset
!=
-
1
)
{
labels
[
i
]
=
uids
[
offset
];
}
}
rc
.
RecordSection
(
"map uids"
);
MapUids
(
uids
,
labels
,
offsets
.
size
()
*
k
);
rc
.
RecordSection
(
"map uids "
+
std
::
to_string
(
offsets
.
size
()
*
k
));
}
if
(
hybrid
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录