refactor(db): FilesToSearch

Former-commit-id: dcb7f972ee13a0916129dfec5b05dad66025dfbf

cpp/src/db/DBImpl.cpp

@@ -70,7 +70,7 @@ Status DBImpl<EngineT>::search(const std::string& table_id, size_t k, size_t nq,
         const float* vectors, const meta::DatesT& dates, QueryResults& results) {
 
     meta::DatePartionedTableFilesSchema files;
-    auto status = _pMeta->files_to_search(table_id, dates, files);
+    auto status = _pMeta->FilesToSearch(table_id, dates, files);
     if (!status.ok()) { return status; }
 
     LOG(DEBUG) << "Search DateT Size=" << files.size();

cpp/src/db/DBMetaImpl.cpp

@@ -303,7 +303,7 @@ Status DBMetaImpl::files_to_index(TableFilesSchema& files) {
     return Status::OK();
 }
 
-Status DBMetaImpl::files_to_search(const std::string &table_id,
+Status DBMetaImpl::FilesToSearch(const std::string &table_id,
                                    const DatesT& partition,
                                    DatePartionedTableFilesSchema &files) {
     files.clear();
@@ -330,21 +330,22 @@ Status DBMetaImpl::files_to_search(const std::string &table_id,
             return status;
         }
 
+        TableFileSchema table_file;
+
         for (auto& file : selected) {
-            TableFileSchema group_file;
-            group_file.id = std::get<0>(file);
-            group_file.table_id = std::get<1>(file);
-            group_file.file_id = std::get<2>(file);
-            group_file.file_type = std::get<3>(file);
-            group_file.size = std::get<4>(file);
-            group_file.date = std::get<5>(file);
-            group_file.dimension = table_schema.dimension;
-            GetGroupFilePath(group_file);
-            auto dateItr = files.find(group_file.date);
+            table_file.id = std::get<0>(file);
+            table_file.table_id = std::get<1>(file);
+            table_file.file_id = std::get<2>(file);
+            table_file.file_type = std::get<3>(file);
+            table_file.size = std::get<4>(file);
+            table_file.date = std::get<5>(file);
+            table_file.dimension = table_schema.dimension;
+            GetGroupFilePath(table_file);
+            auto dateItr = files.find(table_file.date);
             if (dateItr == files.end()) {
-                files[group_file.date] = TableFilesSchema();
+                files[table_file.date] = TableFilesSchema();
             }
-            files[group_file.date].push_back(group_file);
+            files[table_file.date].push_back(table_file);
         }
     } catch (std::exception & e) {
         LOG(DEBUG) << e.what();

cpp/src/db/DBMetaImpl.h

@@ -33,11 +33,11 @@ public:
 
     virtual Status UpdateTableFiles(TableFilesSchema& files) override;
 
-    virtual Status files_to_merge(const std::string& table_id,
+    virtual Status FilesToSearch(const std::string& table_id,
+                                  const DatesT& partition,
                                   DatePartionedTableFilesSchema& files) override;
 
-    virtual Status files_to_search(const std::string& table_id,
-                                  const DatesT& partition,
+    virtual Status files_to_merge(const std::string& table_id,
             DatePartionedTableFilesSchema& files) override;
 
     virtual Status files_to_index(TableFilesSchema&) override;

cpp/src/db/Meta.h

@@ -35,7 +35,7 @@ public:
 
     virtual Status UpdateTableFiles(TableFilesSchema& files) = 0;
 
-    virtual Status files_to_search(const std::string& table_id,
+    virtual Status FilesToSearch(const std::string& table_id,
                                    const DatesT& partition,
                                    DatePartionedTableFilesSchema& files) = 0;
 

cpp/unittest/db/meta_tests.cpp

@@ -238,7 +238,7 @@ TEST_F(MetaTest, TABLE_FILES_TEST) {
     ASSERT_EQ(files.size(), to_index_files_cnt);
 
     meta::DatesT dates = {table_file.date};
-    status = impl_->files_to_search(table_id, dates, dated_files);
+    status = impl_->FilesToSearch(table_id, dates, dated_files);
     ASSERT_TRUE(status.ok());
     ASSERT_EQ(dated_files[table_file.date].size(),
             to_index_files_cnt+raw_files_cnt+index_files_cnt);