Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
cedfc84d
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,发现更多精彩内容 >>
未验证
提交
cedfc84d
编写于
3月 12, 2020
作者:
J
Jin Hai
提交者:
GitHub
3月 12, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1638 from youny626/fix#1635
Fix#1635
上级
03c1b03d
7ec0444d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
3 deletion
+16
-3
CHANGELOG.md
CHANGELOG.md
+6
-1
core/src/db/engine/ExecutionEngineImpl.cpp
core/src/db/engine/ExecutionEngineImpl.cpp
+8
-1
core/unittest/db/utils.cpp
core/unittest/db/utils.cpp
+2
-1
未找到文件。
CHANGELOG.md
浏览文件 @
cedfc84d
...
...
@@ -2,7 +2,12 @@
Please mark all change in change log and use the issue from GitHub
# Milvus 0.7.0 (TBD)
# Milvus 0.7.1 (TBD)
## Bug
-
\#
1635 Vectors can be returned by searching after vectors deleted if
`cache_insert_data`
set true
# Milvus 0.7.0 (2020-03-11)
## Bug
-
\#
715 Milvus crash when searching and building index simultaneously using SQ8H
...
...
core/src/db/engine/ExecutionEngineImpl.cpp
浏览文件 @
cedfc84d
...
...
@@ -738,15 +738,22 @@ ExecutionEngineImpl::BuildIndex(const std::string& location, EngineType engine_t
auto
status
=
Status
::
OK
();
std
::
vector
<
segment
::
doc_id_t
>
uids
;
faiss
::
ConcurrentBitsetPtr
blacklist
;
if
(
from_index
)
{
status
=
to_index
->
BuildAll
(
Count
(),
from_index
->
GetRawVectors
(),
from_index
->
GetRawIds
(),
conf
);
uids
=
from_index
->
GetUids
();
from_index
->
GetBlacklist
(
blacklist
);
}
else
if
(
bin_from_index
)
{
status
=
to_index
->
BuildAll
(
Count
(),
bin_from_index
->
GetRawVectors
(),
bin_from_index
->
GetRawIds
(),
conf
);
uids
=
bin_from_index
->
GetUids
();
bin_from_index
->
GetBlacklist
(
blacklist
);
}
to_index
->
SetUids
(
uids
);
ENGINE_LOG_DEBUG
<<
"set uids "
<<
to_index
->
GetUids
().
size
()
<<
" for "
<<
location
;
ENGINE_LOG_DEBUG
<<
"Set "
<<
to_index
->
GetUids
().
size
()
<<
"uids for "
<<
location
;
if
(
blacklist
!=
nullptr
)
{
to_index
->
SetBlacklist
(
blacklist
);
ENGINE_LOG_DEBUG
<<
"Set blacklist for index "
<<
location
;
}
if
(
!
status
.
ok
())
{
throw
Exception
(
DB_ERROR
,
status
.
message
());
...
...
core/unittest/db/utils.cpp
浏览文件 @
cedfc84d
...
...
@@ -65,7 +65,7 @@ static const char *CONFIG_STR =
" cpu_cache_capacity: 4 # GB, CPU memory used for cache
\n
"
" cpu_cache_threshold: 0.85 # percentage of data kept when cache cleanup triggered
\n
"
" insert_buffer_size: 4 # GB, maximum insert buffer size allowed
\n
"
" cache_insert_data:
fals
e # whether load inserted data into cache
\n
"
" cache_insert_data:
tru
e # whether load inserted data into cache
\n
"
"
\n
"
"engine_config:
\n
"
" use_blas_threshold: 20
\n
"
...
...
@@ -179,6 +179,7 @@ DBTest::SetUp() {
milvus
::
scheduler
::
JobMgrInst
::
GetInstance
()
->
Start
();
auto
options
=
GetOptions
();
options
.
insert_cache_immediately_
=
true
;
db_
=
milvus
::
engine
::
DBFactory
::
Build
(
options
);
std
::
string
config_path
(
options
.
meta_
.
path_
+
CONFIG_FILE
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录