Merge pull request #562 from yhmo/migration

#354 Build migration scripts into milvus docker image

CHANGELOG.md

@@ -53,6 +53,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

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

core/unittest/db/test_db.cpp

@@ -710,8 +710,8 @@ TEST_F(DBTest2, DELETE_BY_RANGE_TEST) {
     ASSERT_NE(size, 0UL);
 
     std::vector<milvus::engine::meta::DateT> 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);