From c1a91ac2d155b6d8a3200e994ef0730088fc0dc8 Mon Sep 17 00:00:00 2001 From: starlord Date: Sat, 7 Sep 2019 19:16:21 +0800 Subject: [PATCH] refine unittest code Former-commit-id: 4d9a2330acc0cb7cb7fe663fcb4c2035203bc78b --- cpp/unittest/db/db_tests.cpp | 28 ++++++++++----------- cpp/unittest/db/mem_test.cpp | 22 ++++++++--------- cpp/unittest/db/mysql_db_test.cpp | 16 ++++++------ cpp/unittest/db/utils.cpp | 7 ------ cpp/unittest/db/utils.h | 2 -- cpp/unittest/knowhere/knowhere_test.cpp | 1 - cpp/unittest/knowhere/utils.cpp | 8 ------ cpp/unittest/knowhere/utils.h | 2 -- cpp/unittest/metrics/metrics_test.cpp | 2 -- cpp/unittest/metrics/utils.cpp | 8 ------ cpp/unittest/server/cache_test.cpp | 33 +++++++++++++++++++------ 11 files changed, 59 insertions(+), 70 deletions(-) diff --git a/cpp/unittest/db/db_tests.cpp b/cpp/unittest/db/db_tests.cpp index acf69a9aa1..2c300849b4 100644 --- a/cpp/unittest/db/db_tests.cpp +++ b/cpp/unittest/db/db_tests.cpp @@ -147,7 +147,7 @@ TEST_F(DBTest, DB_TEST) { engine::meta::TableSchema table_info_get; table_info_get.table_id_ = TABLE_NAME; stat = db_->DescribeTable(table_info_get); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); ASSERT_EQ(table_info_get.dimension_, TABLE_DIM); engine::IDNumbers vector_ids; @@ -181,7 +181,7 @@ TEST_F(DBTest, DB_TEST) { ss << "Search " << j << " With Size " << count/engine::meta::M << " M"; STOP_TIMER(ss.str()); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); for (auto k=0; kGetTableRowCount(TABLE_NAME, count); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); ASSERT_TRUE(count > 0); }; @@ -223,7 +223,7 @@ TEST_F(DBTest, SEARCH_TEST) { engine::meta::TableSchema table_info_get; table_info_get.table_id_ = TABLE_NAME; stat = db_->DescribeTable(table_info_get); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); ASSERT_EQ(table_info_get.dimension_, TABLE_DIM); // prepare raw data @@ -258,7 +258,7 @@ TEST_F(DBTest, SEARCH_TEST) { for (int j = 0; j < nb / batch_size; ++j) { stat = db_->InsertVectors(TABLE_NAME, batch_size, xb.data()+batch_size*j*TABLE_DIM, ids); if (j == 200){ sleep(1);} - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); } engine::TableIndex index; @@ -268,7 +268,7 @@ TEST_F(DBTest, SEARCH_TEST) { { engine::QueryResults results; stat = db_->Query(TABLE_NAME, k, nq, 10, xq.data(), results); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); } {//search by specify index file @@ -276,7 +276,7 @@ TEST_F(DBTest, SEARCH_TEST) { std::vector file_ids = {"1", "2", "3", "4", "5", "6"}; engine::QueryResults results; stat = db_->Query(TABLE_NAME, file_ids, k, nq, 10, xq.data(), dates, results); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); } // TODO(linxj): add groundTruth assert @@ -289,7 +289,7 @@ TEST_F(DBTest, PRELOADTABLE_TEST) { engine::meta::TableSchema table_info_get; table_info_get.table_id_ = TABLE_NAME; stat = db_->DescribeTable(table_info_get); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); ASSERT_EQ(table_info_get.dimension_, TABLE_DIM); int64_t nb = VECTOR_COUNT; @@ -309,7 +309,7 @@ TEST_F(DBTest, PRELOADTABLE_TEST) { int64_t prev_cache_usage = cache::CpuCacheMgr::GetInstance()->CacheUsage(); stat = db_->PreloadTable(TABLE_NAME); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); int64_t cur_cache_usage = cache::CpuCacheMgr::GetInstance()->CacheUsage(); ASSERT_TRUE(prev_cache_usage < cur_cache_usage); @@ -322,7 +322,7 @@ TEST_F(DBTest2, ARHIVE_DISK_CHECK) { std::vector table_schema_array; stat = db_->AllTables(table_schema_array); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); bool bfound = false; for(auto& schema : table_schema_array) { if(schema.table_id_ == TABLE_NAME) { @@ -335,7 +335,7 @@ TEST_F(DBTest2, ARHIVE_DISK_CHECK) { engine::meta::TableSchema table_info_get; table_info_get.table_id_ = TABLE_NAME; stat = db_->DescribeTable(table_info_get); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); ASSERT_EQ(table_info_get.dimension_, TABLE_DIM); uint64_t size; @@ -366,7 +366,7 @@ TEST_F(DBTest2, DELETE_TEST) { engine::meta::TableSchema table_info_get; table_info_get.table_id_ = TABLE_NAME; stat = db_->DescribeTable(table_info_get); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); bool has_table = false; db_->HasTable(TABLE_NAME, has_table); @@ -405,7 +405,7 @@ TEST_F(DBTest2, DELETE_BY_RANGE_TEST) { engine::meta::TableSchema table_info_get; table_info_get.table_id_ = TABLE_NAME; stat = db_->DescribeTable(table_info_get); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); bool has_table = false; db_->HasTable(TABLE_NAME, has_table); @@ -433,7 +433,7 @@ TEST_F(DBTest2, DELETE_BY_RANGE_TEST) { ConvertTimeRangeToDBDates(start_value, end_value, dates); stat = db_->DeleteTable(TABLE_NAME, dates); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); uint64_t row_count = 0; db_->GetTableRowCount(TABLE_NAME, row_count); diff --git a/cpp/unittest/db/mem_test.cpp b/cpp/unittest/db/mem_test.cpp index 9344d2ccc3..460003a9f1 100644 --- a/cpp/unittest/db/mem_test.cpp +++ b/cpp/unittest/db/mem_test.cpp @@ -3,12 +3,12 @@ #include "db/insert/VectorSource.h" #include "db/insert/MemTableFile.h" #include "db/insert/MemTable.h" -#include "utils.h" #include "db/Factories.h" #include "db/Constants.h" #include "db/engine/EngineFactory.h" -#include "metrics/Metrics.h" #include "db/meta/MetaConsts.h" +#include "metrics/Metrics.h" +#include "utils.h" #include #include @@ -223,7 +223,7 @@ TEST_F(MemManagerTest2, SERIAL_INSERT_SEARCH_TEST) { engine::meta::TableSchema table_info_get; table_info_get.table_id_ = TABLE_NAME; stat = db_->DescribeTable(table_info_get); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); ASSERT_EQ(table_info_get.dimension_, TABLE_DIM); std::map> search_vectors; @@ -269,7 +269,7 @@ TEST_F(MemManagerTest2, INSERT_TEST) { engine::meta::TableSchema table_info_get; table_info_get.table_id_ = TABLE_NAME; stat = db_->DescribeTable(table_info_get); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); ASSERT_EQ(table_info_get.dimension_, TABLE_DIM); auto start_time = METRICS_NOW_TIME; @@ -295,7 +295,7 @@ TEST_F(MemManagerTest2, CONCURRENT_INSERT_SEARCH_TEST) { engine::meta::TableSchema table_info_get; table_info_get.table_id_ = TABLE_NAME; stat = db_->DescribeTable(table_info_get); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); ASSERT_EQ(table_info_get.dimension_, TABLE_DIM); engine::IDNumbers vector_ids; @@ -329,7 +329,7 @@ TEST_F(MemManagerTest2, CONCURRENT_INSERT_SEARCH_TEST) { ss << "Search " << j << " With Size " << count / engine::meta::M << " M"; STOP_TIMER(ss.str()); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); for (auto k = 0; k < qb; ++k) { ASSERT_EQ(results[k][0].first, target_ids[k]); ss.str(""); @@ -366,7 +366,7 @@ TEST_F(MemManagerTest2, VECTOR_IDS_TEST) { engine::meta::TableSchema table_info_get; table_info_get.table_id_ = TABLE_NAME; stat = db_->DescribeTable(table_info_get); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); ASSERT_EQ(table_info_get.dimension_, TABLE_DIM); engine::IDNumbers vector_ids; @@ -383,7 +383,7 @@ TEST_F(MemManagerTest2, VECTOR_IDS_TEST) { stat = db_->InsertVectors(TABLE_NAME, nb, xb.data(), vector_ids); ASSERT_EQ(vector_ids[0], 0); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); nb = 25000; xb.clear(); @@ -395,7 +395,7 @@ TEST_F(MemManagerTest2, VECTOR_IDS_TEST) { } stat = db_->InsertVectors(TABLE_NAME, nb, xb.data(), vector_ids); ASSERT_EQ(vector_ids[0], nb); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); nb = 262144; //512M xb.clear(); @@ -407,14 +407,14 @@ TEST_F(MemManagerTest2, VECTOR_IDS_TEST) { } stat = db_->InsertVectors(TABLE_NAME, nb, xb.data(), vector_ids); ASSERT_EQ(vector_ids[0], nb/2); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); nb = 65536; //128M xb.clear(); BuildVectors(nb, xb); vector_ids.clear(); stat = db_->InsertVectors(TABLE_NAME, nb, xb.data(), vector_ids); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); nb = 100; xb.clear(); diff --git a/cpp/unittest/db/mysql_db_test.cpp b/cpp/unittest/db/mysql_db_test.cpp index 943577bb72..a98959ed97 100644 --- a/cpp/unittest/db/mysql_db_test.cpp +++ b/cpp/unittest/db/mysql_db_test.cpp @@ -53,7 +53,7 @@ TEST_F(MySqlDBTest, DB_TEST) { engine::meta::TableSchema table_info_get; table_info_get.table_id_ = TABLE_NAME; stat = db_->DescribeTable(table_info_get); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); ASSERT_EQ(table_info_get.dimension_, TABLE_DIM); engine::IDNumbers vector_ids; @@ -90,7 +90,7 @@ TEST_F(MySqlDBTest, DB_TEST) { ss << "Search " << j << " With Size " << count/engine::meta::M << " M"; STOP_TIMER(ss.str()); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); for (auto k=0; kDescribeTable(table_info_get); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); ASSERT_EQ(table_info_get.dimension_, TABLE_DIM); // prepare raw data @@ -173,14 +173,14 @@ TEST_F(MySqlDBTest, SEARCH_TEST) { for (int j = 0; j < nb / batch_size; ++j) { stat = db_->InsertVectors(TABLE_NAME, batch_size, xb.data()+batch_size*j*TABLE_DIM, ids); if (j == 200){ sleep(1);} - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); } sleep(2); // wait until build index finish engine::QueryResults results; stat = db_->Query(TABLE_NAME, k, nq, 10, xq.data(), results); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); }; TEST_F(MySqlDBTest, ARHIVE_DISK_CHECK) { @@ -189,7 +189,7 @@ TEST_F(MySqlDBTest, ARHIVE_DISK_CHECK) { std::vector table_schema_array; stat = db_->AllTables(table_schema_array); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); bool bfound = false; for(auto& schema : table_schema_array) { if(schema.table_id_ == TABLE_NAME) { @@ -202,7 +202,7 @@ TEST_F(MySqlDBTest, ARHIVE_DISK_CHECK) { engine::meta::TableSchema table_info_get; table_info_get.table_id_ = TABLE_NAME; stat = db_->DescribeTable(table_info_get); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); ASSERT_EQ(table_info_get.dimension_, TABLE_DIM); engine::IDNumbers vector_ids; @@ -236,7 +236,7 @@ TEST_F(MySqlDBTest, DELETE_TEST) { engine::meta::TableSchema table_info_get; table_info_get.table_id_ = TABLE_NAME; stat = db_->DescribeTable(table_info_get); - ASSERT_STATS(stat); + ASSERT_TRUE(stat.ok()); bool has_table = false; db_->HasTable(TABLE_NAME, has_table); diff --git a/cpp/unittest/db/utils.cpp b/cpp/unittest/db/utils.cpp index d347388739..5b8d82522d 100644 --- a/cpp/unittest/db/utils.cpp +++ b/cpp/unittest/db/utils.cpp @@ -35,13 +35,6 @@ public: }; -void ASSERT_STATS(engine::Status& stat) { - ASSERT_TRUE(stat.ok()); - if(!stat.ok()) { - std::cout << stat.ToString() << std::endl; - } -} - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// void BaseTest::InitLog() { el::Configurations defaultConf; diff --git a/cpp/unittest/db/utils.h b/cpp/unittest/db/utils.h index 15c8a3fa54..7e3f7d5eac 100644 --- a/cpp/unittest/db/utils.h +++ b/cpp/unittest/db/utils.h @@ -32,8 +32,6 @@ #define STOP_TIMER(name) #endif -void ASSERT_STATS(zilliz::milvus::engine::Status &stat); - class BaseTest : public ::testing::Test { protected: void InitLog(); diff --git a/cpp/unittest/knowhere/knowhere_test.cpp b/cpp/unittest/knowhere/knowhere_test.cpp index 2bd4bddc70..85373a0adc 100644 --- a/cpp/unittest/knowhere/knowhere_test.cpp +++ b/cpp/unittest/knowhere/knowhere_test.cpp @@ -34,7 +34,6 @@ class KnowhereWrapperTest std::string generator_type; std::tie(index_type, generator_type, dim, nb, nq, k, train_cfg, search_cfg) = GetParam(); - //auto generator = GetGenerateFactory(generator_type); auto generator = std::make_shared(); generator->GenData(dim, nb, nq, xb, xq, ids, k, gt_ids, gt_dis); diff --git a/cpp/unittest/knowhere/utils.cpp b/cpp/unittest/knowhere/utils.cpp index ede5dd0485..e07bd2cd42 100644 --- a/cpp/unittest/knowhere/utils.cpp +++ b/cpp/unittest/knowhere/utils.cpp @@ -9,14 +9,6 @@ #include "utils.h" -DataGenPtr GetGenerateFactory(const std::string &gen_type) { - std::shared_ptr generator; - if (gen_type == "default") { - generator = std::make_shared(); - } - return generator; -} - void DataGenBase::GenData(const int &dim, const int &nb, const int &nq, float *xb, float *xq, long *ids, const int &k, long *gt_ids, float *gt_dis) { diff --git a/cpp/unittest/knowhere/utils.h b/cpp/unittest/knowhere/utils.h index ce3c428d68..69653b6470 100644 --- a/cpp/unittest/knowhere/utils.h +++ b/cpp/unittest/knowhere/utils.h @@ -17,8 +17,6 @@ class DataGenBase; using DataGenPtr = std::shared_ptr; -extern DataGenPtr GetGenerateFactory(const std::string &gen_type); - class DataGenBase { public: diff --git a/cpp/unittest/metrics/metrics_test.cpp b/cpp/unittest/metrics/metrics_test.cpp index 2d31154e3c..d33ace6868 100644 --- a/cpp/unittest/metrics/metrics_test.cpp +++ b/cpp/unittest/metrics/metrics_test.cpp @@ -90,8 +90,6 @@ TEST_F(MetricTest, Metric_Tes) { // stat = db_->Query(group_name, k, qb, qxb, results); ss << "Search " << j << " With Size " << (float)(count*group_dim*sizeof(float))/(1024*1024) << " M"; - -// ASSERT_STATS(stat); for (auto k=0; k