From b4a2aed41f11e7cf5c64aee71ffc086b9f444ad3 Mon Sep 17 00:00:00 2001 From: groot Date: Wed, 27 Nov 2019 10:34:58 +0800 Subject: [PATCH 1/2] #354 Build migration scripts into milvus docker image --- CHANGELOG.md | 1 + core/CMakeLists.txt | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7083cc12eb..9e484487fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,7 @@ Please mark all change in change log and use the ticket from JIRA. - \#310 - Add Q&A for 'protocol https not supported or disable in libcurl' issue - \#314 - add Find FAISS in CMake - \#322 - Add option to enable / disable prometheus +- \#354 - Build migration scripts into milvus docker image - \#358 - Add more information in build.sh and install.md - \#404 - Add virtual method Init() in Pass abstract class - \#409 - Add a Fallback pass in optimizer diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 01d0e1b9f2..8be873bb92 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -204,6 +204,11 @@ install(DIRECTORY scripts/ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ FILES_MATCHING PATTERN "*.sh") +install(DIRECTORY scripts/migration + DESTINATION scripts + FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ + GROUP_EXECUTE GROUP_READ + WORLD_EXECUTE WORLD_READ) install(FILES conf/server_config.yaml conf/log_config.conf From 73f12432cc354ee8937efcf57eef7e10e9ec6278 Mon Sep 17 00:00:00 2001 From: groot Date: Wed, 27 Nov 2019 11:01:29 +0800 Subject: [PATCH 2/2] random failure of unittest --- core/unittest/db/test_db.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/unittest/db/test_db.cpp b/core/unittest/db/test_db.cpp index 217fbe429e..392173cf42 100644 --- a/core/unittest/db/test_db.cpp +++ b/core/unittest/db/test_db.cpp @@ -666,8 +666,8 @@ TEST_F(DBTest2, DELETE_BY_RANGE_TEST) { ASSERT_NE(size, 0UL); std::vector dates; - std::string start_value = CurrentTmDate(); - std::string end_value = CurrentTmDate(1); + std::string start_value = CurrentTmDate(-5); + std::string end_value = CurrentTmDate(5); ConvertTimeRangeToDBDates(start_value, end_value, dates); stat = db_->DropTable(TABLE_NAME, dates);