admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'be_stable' into 'branch-0.3.1-xiaojun'

Browse Source 
1. fix bzip2 download url

See merge request megasearch/milvus!256

Former-commit-id: d254443a1d3e976a5a5bdce97330d766ff039796
This commit is contained in:
peng.xu 2019-07-22 11:01:37 +08:00
commit 168ca0a514
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpp/cmake/ThirdPartyPackages.cmake
View File

@ -230,7 +230,7 @@ endif()
if(DEFINED ENV{MILVUS_BZIP2_URL})
set(BZIP2_SOURCE_URL "$ENV{MILVUS_BZIP2_URL}")
else()
set(BZIP2_SOURCE_URL "https://fossies.org/linux/misc/bzip2-${BZIP2_VERSION}.tar.gz")
set(BZIP2_SOURCE_URL "https://sourceware.org/pub/bzip2/bzip2-${BZIP2_VERSION}.tar.gz")
endif()
if(DEFINED ENV{MILVUS_EASYLOGGINGPP_URL})

9
cpp/unittest/server/cache_test.cpp
View File

@ -7,6 +7,7 @@
#include "cache/CpuCacheMgr.h"
#include "cache/GpuCacheMgr.h"
#include "utils/Error.h"
#include "wrapper/Index.h"
#include "wrapper/knowhere/vec_index.h"
@ -29,7 +30,7 @@ public:
class MockVecIndex : public engine::VecIndex {
public:
virtual void BuildAll(const long &nb,
virtual server::KnowhereError BuildAll(const long &nb,
const float *xb,
const long *ids,
const engine::Config &cfg,
@ -42,14 +43,14 @@ public:
return engine::IndexType::INVALID;
}
virtual void Add(const long &nb,
virtual server::KnowhereError Add(const long &nb,
const float *xb,
const long *ids,
const engine::Config &cfg = engine::Config()) {
}
virtual void Search(const long &nq,
virtual server::KnowhereError Search(const long &nq,
const float *xq,
float *dist,
long *ids,
@ -70,7 +71,7 @@ public:
return binset;
}
virtual void Load(const zilliz::knowhere::BinarySet &index_binary) {
virtual server::KnowhereError Load(const zilliz::knowhere::BinarySet &index_binary) {
}