milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/branch-1.2' into branch-1.2 

Former-commit-id: f89f423b90a8c26732b8e7728fa5ae5688d968a3
pull/191/head
zhiru 2019-05-29 19:19:19 +08:00
parent 12aa730645 8927a616d5
commit 9d79dd851f
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpp/CHANGELOG.md
View File

@ -21,3 +21,4 @@ Please mark all change in change log and use the ticket from JIRA.
- MS-1 - Add CHANGELOG.md
- MS-4 - Refactor the vecwise_engine code structure
- MS-20 - Clean Code Part 1
- MS-30 - Use faiss v1.5.2

1
cpp/src/server/MegasearchTask.cpp
View File

@ -237,7 +237,6 @@ AddVectorTask::AddVectorTask(const std::string& table_name,
record_array_(record_array),
record_ids_(record_ids) {
record_ids_.clear();
record_ids_.resize(record_array.size());
}
BaseTaskPtr AddVectorTask::Create(const std::string& table_name,

2
cpp/thirdparty/versions.txt vendored
View File

@ -26,7 +26,7 @@
BOOST_VERSION=1.70.0
BZIP2_VERSION=1.0.6
EASYLOGGINGPP_VERSION=v9.96.7
FAISS_VERSION=master
FAISS_VERSION=v1.5.2
GTEST_VERSION=1.8.1
LAPACK_VERSION=v3.8.0
LZ4_VERSION=v1.9.1