refine code

Former-commit-id: fba832c2d32bdbaf55cc94c67f7c0e6070b81abb

cpp/src/db/meta/SqliteMetaImpl.cpp

@@ -707,7 +707,7 @@ Status SqliteMetaImpl::FilesToSearch(const std::string &table_id,
             files[table_file.date_].push_back(table_file);
         }
         if(files.empty()) {
-            std::cout << "ERROR" << std::endl;
+            ENGINE_LOG_ERROR << "No file to search for table: " << table_id;
         }
     } catch (std::exception &e) {
         return HandleException("Encounter exception when iterate index files", e);

cpp/src/server/grpc_impl/GrpcRequestTask.cpp

@@ -209,6 +209,7 @@ DescribeTableTask::OnExecute() {
         schema_->mutable_table_name()->set_table_name(table_info.table_id_);
         schema_->set_dimension(table_info.dimension_);
         schema_->set_index_file_size(table_info.index_file_size_);
+        schema_->set_metric_type(table_info.metric_type_);
 
     } catch (std::exception &ex) {
         return SetError(SERVER_UNEXPECTED_ERROR, ex.what());

cpp/unittest/db/mem_test.cpp

@@ -216,7 +216,7 @@ TEST_F(MemManagerTest, MEM_TABLE_TEST) {
     ASSERT_TRUE(status.ok());
 }
 
-TEST_F(MemManagerTest, SERIAL_INSERT_SEARCH_TEST) {
+TEST_F(MemManagerTest2, SERIAL_INSERT_SEARCH_TEST) {
     engine::meta::TableSchema table_info = BuildTableSchema();
     engine::Status stat = db_->CreateTable(table_info);
 
@@ -262,7 +262,7 @@ TEST_F(MemManagerTest, SERIAL_INSERT_SEARCH_TEST) {
     }
 }
 
-TEST_F(MemManagerTest, INSERT_TEST) {
+TEST_F(MemManagerTest2, INSERT_TEST) {
     engine::meta::TableSchema table_info = BuildTableSchema();
     engine::Status stat = db_->CreateTable(table_info);
 
@@ -288,7 +288,7 @@ TEST_F(MemManagerTest, INSERT_TEST) {
     LOG(DEBUG) << "total_time spent in INSERT_TEST (ms) : " << total_time;
 }
 
-TEST_F(MemManagerTest, CONCURRENT_INSERT_SEARCH_TEST) {
+TEST_F(MemManagerTest2, CONCURRENT_INSERT_SEARCH_TEST) {
     engine::meta::TableSchema table_info = BuildTableSchema();
     engine::Status stat = db_->CreateTable(table_info);
 
@@ -359,7 +359,7 @@ TEST_F(MemManagerTest, CONCURRENT_INSERT_SEARCH_TEST) {
     search.join();
 };
 
-TEST_F(MemManagerTest, VECTOR_IDS_TEST) {
+TEST_F(MemManagerTest2, VECTOR_IDS_TEST) {
     engine::meta::TableSchema table_info = BuildTableSchema();
     engine::Status stat = db_->CreateTable(table_info);
 

cpp/unittest/db/utils.cpp

@@ -51,6 +51,10 @@ void BaseTest::InitLog() {
     el::Loggers::reconfigureLogger("default", defaultConf);
 }
 
+void BaseTest::SetUp() {
+    InitLog();
+}
+
 engine::Options BaseTest::GetOptions() {
     auto options = engine::OptionsFactory::Build();
     options.meta.path = "/tmp/milvus_test";
@@ -60,7 +64,7 @@ engine::Options BaseTest::GetOptions() {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 void DBTest::SetUp() {
-    InitLog();
+    BaseTest::SetUp();
 
     server::ConfigNode& config = server::ServerConfig::GetInstance().GetConfig(server::CONFIG_CACHE);
     config.AddSequenceItem(server::CONFIG_GPU_IDS, "0");
@@ -104,7 +108,8 @@ engine::Options DBTest2::GetOptions() {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 void MetaTest::SetUp() {
-    InitLog();
+    BaseTest::SetUp();
+
     impl_ = engine::DBMetaImplFactory::Build();
 }
 
@@ -127,7 +132,7 @@ engine::Options MySqlDBTest::GetOptions() {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 void MySqlMetaTest::SetUp() {
-    InitLog();
+    BaseTest::SetUp();
 
     engine::DBMetaOptions options = GetOptions().meta;
     int mode = engine::Options::MODE::SINGLE;

cpp/unittest/db/utils.h

@@ -37,6 +37,8 @@ void ASSERT_STATS(zilliz::milvus::engine::Status &stat);
 class BaseTest : public ::testing::Test {
 protected:
     void InitLog();
+
+    virtual void SetUp() override;
     virtual zilliz::milvus::engine::Options GetOptions();
 };
 
@@ -82,5 +84,9 @@ class MySqlMetaTest : public BaseTest {
 
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-class MemManagerTest : public DBTest {
+class MemManagerTest : public BaseTest {
+};
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+class MemManagerTest2 : public DBTest {
 };