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

Fix web start fail for IP family (#3778) 

* Fix web start fail for ip family

Signed-off-by: yinghao.zou <yinghao.zou@zilliz.com>

* update oatpp md5

Signed-off-by: yinghao.zou <yinghao.zou@zilliz.com>

* Add more detail case

Signed-off-by: yinghao.zou <yinghao.zou@zilliz.com>
Signed-off-by: shengjun.li <shengjun.li@zilliz.com>
pull/3855/head
BossZou 2020-09-19 12:10:11 +08:00 committed by shengjun.li
parent bbc46b7d55
commit 0571fe18b9
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/thirdparty/oatpp/CMakeLists.txt vendored
View File

@ -13,14 +13,15 @@
if ( DEFINED ENV{MILVUS_OATPP_URL} )
set( OATPP_SOURCE_URL "$ENV{MILVUS_OATPP_URL}" )
else()
set( OATPP_SOURCE_URL "https://github.com/oatpp/oatpp/archive/${OATPP_VERSION}.tar.gz" )
# set( OATPP_SOURCE_URL "https://github.com/oatpp/oatpp/archive/${OATPP_VERSION}.tar.gz" )
set( OATPP_SOURCE_URL "https://github.com/BossZou/oatpp/archive/${OATPP_VERSION}.tar.gz" )
endif()
message( STATUS "Building oatpp-${OATPP_VERSION} from source" )
FetchContent_Declare(
oatpp
URL ${OATPP_SOURCE_URL}
URL_MD5 "ed2330211ec528cb0e236958e97e1974"
URL_MD5 "c0d96504e8521a8495f76aabbdb5b163"
SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/oatpp-src
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/oatpp-build
DOWNLOAD_DIR ${THIRDPARTY_DOWNLOAD_PATH} )

2
core/thirdparty/versions.txt vendored
View File

@ -10,7 +10,7 @@ GRPC_VERSION=9a62f6e05d0be96df674d60a66f330a085ced095
ZLIB_VERSION=v1.2.11
OPENTRACING_VERSION=v1.5.1
FIU_VERSION=1.00
OATPP_VERSION=56097146836986a7c7f78f82729dce0f2c2c6b9f
OATPP_VERSION=v1.1.0
AWS_VERSION=1.7.250
CRC32C_VERSION=1.1.1

15
core/unittest/db/test_snapshot.cpp
View File

@ -2162,6 +2162,21 @@ TEST_F(SnapshotTest, MultiSegmentsTest) {
auto status = Snapshots::GetInstance().GetSnapshot(new_ss, collection_name);
ASSERT_TRUE(status.ok()) << status.ToString();
ASSERT_EQ(new_ss->GetCollectionCommit()->GetRowCount(), (loop - r) * 100);
std::vector<ID_TYPE> segment_ids;
auto segment_executor = [&](const SegmentPtr& segment, SegmentIterator* iterator) -> Status {
segment_ids.push_back(segment->GetID());
return Status::OK();
};
auto segment_iterator = std::make_shared<SegmentIterator>(new_ss, segment_executor);
segment_iterator->Iterate();
ASSERT_TRUE(segment_iterator->GetStatus().ok());
ASSERT_EQ(segment_ids.size(), loop - r);
for (auto & id : segment_ids) {
auto sc = new_ss->GetSegmentCommitBySegmentId(id);
ASSERT_TRUE(sc);
ASSERT_EQ(sc->GetRowCount(), 100);
}
}
struct GCSchedule {