Merge branch 'branch-0.3.1' into 'branch-0.3.1'

MS-235 Some test cases random fail

See merge request megasearch/milvus!222

Former-commit-id: 3fde5ec1c316895b2805a355cb49fb5bd3da9744

cpp/CHANGELOG.md

@@ -18,6 +18,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-233 - Remove mem manager log
 - MS-230 - Change parameter name: Maximum_memory to insert_buffer_size
 - MS-234 - Some case cause background merge thread stop
+- MS-235 - Some test cases random fail
 
 ## Improvement
 - MS-156 - Add unittest for merge result functions

cpp/src/db/DBMetaImpl.cpp

@@ -291,6 +291,8 @@ Status DBMetaImpl::HasNonIndexFiles(const std::string& table_id, bool& has) {
     try {
         auto selected = ConnectorPtr->select(columns(&TableFileSchema::id_),
                                              where((c(&TableFileSchema::file_type_) == (int) TableFileSchema::RAW
+                                                    or
+                                                    c(&TableFileSchema::file_type_) == (int) TableFileSchema::NEW
                                                     or
                                                     c(&TableFileSchema::file_type_) == (int) TableFileSchema::TO_INDEX)
                                                    and c(&TableFileSchema::table_id_) == table_id