diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md
index 812e62eb2de2e4fe237e65889442cef8fd5b9d28..3e699d8cd1ef0c30ddee8fe3b91ecc7e377425e1 100644
--- a/cpp/CHANGELOG.md
+++ b/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
diff --git a/cpp/src/db/DBMetaImpl.cpp b/cpp/src/db/DBMetaImpl.cpp
index 99ae3b6711a7aa8edfdcac8dfb0657f829d83d7c..48e0fa46cd8e8a7ab7cb972bfa34be989e78fa9c 100644
--- a/cpp/src/db/DBMetaImpl.cpp
+++ b/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