Skip to content

milvus
milvus

BaiXuePrincess / milvus
与 Fork 源项目一致

从无法访问的项目Fork

通知 7
Star 4
Fork 0
milvus
milvus

体验新版 GitCode，发现更多精彩内容 >>

提交 41bfe4bf 编写于 作者: J jinhai
浏览文件
操作

Merge branch 'branch-0.3.0' into 'branch-0.3.0' 

MS-126 Add more error code

See merge request megasearch/vecwise_engine!126

Former-commit-id: feb007729a140376dab2a3dc13c0dc74dc4b9d93
上级 3d2c8014 8622b12a
隐藏空白更改
内联 并排
Showing with 261 addition and 226 deletion
cpp/CHANGELOG.md
浏览文件 @ 41bfe4bf
...@@ -23,6 +23,7 @@ Please mark all change in change log and use the ticket from JIRA. ...@@ -23,6 +23,7 @@ Please mark all change in change log and use the ticket from JIRA.
- MS-115 - Change is_startup of metric_config switch from true to on - MS-115 - Change is_startup of metric_config switch from true to on
- MS-122 - Archive criteria config - MS-122 - Archive criteria config
- MS-124 - HasTable interface - MS-124 - HasTable interface
- MS-126 - Add more error code
## New Feature ## New Feature
......
cpp/src/db/DBMetaImpl.cpp
浏览文件 @ 41bfe4bf
...@@ -192,9 +192,11 @@ Status DBMetaImpl::CreateTable(TableSchema &table_schema) { ...@@ -192,9 +192,11 @@ Status DBMetaImpl::CreateTable(TableSchema &table_schema) {
auto table = ConnectorPtr->select(columns(&TableSchema::state_), auto table = ConnectorPtr->select(columns(&TableSchema::state_),
where(c(&TableSchema::table_id_) == table_schema.table_id_)); where(c(&TableSchema::table_id_) == table_schema.table_id_));
if (table.size() == 1) { if (table.size() == 1) {
std::string msg = (TableSchema::TO_DELETE == std::get<0>(table[0])) ? if(TableSchema::TO_DELETE == std::get<0>(table[0])) {
"Table already exists and it is in delete state, please wait a second" : "Table already exists"; return Status::Error("Table already exists and it is in delete state, please wait a second");
return Status::Error(msg); } else {
return Status::OK();//table already exists, no error
}
} }
} }
...@@ -328,7 +330,7 @@ Status DBMetaImpl::HasTable(const std::string &table_id, bool &has_or_not) { ...@@ -328,7 +330,7 @@ Status DBMetaImpl::HasTable(const std::string &table_id, bool &has_or_not) {
} }
} catch (std::exception &e) { } catch (std::exception &e) {
HandleException("Encounter exception when lookup table", e); return HandleException("Encounter exception when lookup table", e);
} }
return Status::OK(); return Status::OK();
...@@ -358,7 +360,7 @@ Status DBMetaImpl::AllTables(std::vector<TableSchema>& table_schema_array) { ...@@ -358,7 +360,7 @@ Status DBMetaImpl::AllTables(std::vector<TableSchema>& table_schema_array) {
} }
} catch (std::exception &e) { } catch (std::exception &e) {
HandleException("Encounter exception when lookup all tables", e); return HandleException("Encounter exception when lookup all tables", e);
} }
return Status::OK(); return Status::OK();
......
cpp/src/server/RequestScheduler.cpp
浏览文件 @ 41bfe4bf
...@@ -18,34 +18,34 @@ using namespace ::milvus; ...@@ -18,34 +18,34 @@ using namespace ::milvus;
namespace { namespace {
const std::map<ServerError, thrift::ErrorCode::type> &ErrorMap() { const std::map<ServerError, thrift::ErrorCode::type> &ErrorMap() {
static const std::map<ServerError, thrift::ErrorCode::type> code_map = { static const std::map<ServerError, thrift::ErrorCode::type> code_map = {
{SERVER_UNEXPECTED_ERROR, thrift::ErrorCode::ILLEGAL_ARGUMENT}, {SERVER_UNEXPECTED_ERROR, thrift::ErrorCode::UNEXPECTED_ERROR},
{SERVER_NULL_POINTER, thrift::ErrorCode::ILLEGAL_ARGUMENT}, {SERVER_UNSUPPORTED_ERROR, thrift::ErrorCode::UNEXPECTED_ERROR},
{SERVER_NULL_POINTER, thrift::ErrorCode::UNEXPECTED_ERROR},
{SERVER_INVALID_ARGUMENT, thrift::ErrorCode::ILLEGAL_ARGUMENT}, {SERVER_INVALID_ARGUMENT, thrift::ErrorCode::ILLEGAL_ARGUMENT},
{SERVER_FILE_NOT_FOUND, thrift::ErrorCode::ILLEGAL_ARGUMENT}, {SERVER_FILE_NOT_FOUND, thrift::ErrorCode::FILE_NOT_FOUND},
{SERVER_NOT_IMPLEMENT, thrift::ErrorCode::ILLEGAL_ARGUMENT}, {SERVER_NOT_IMPLEMENT, thrift::ErrorCode::UNEXPECTED_ERROR},
{SERVER_BLOCKING_QUEUE_EMPTY, thrift::ErrorCode::ILLEGAL_ARGUMENT}, {SERVER_BLOCKING_QUEUE_EMPTY, thrift::ErrorCode::UNEXPECTED_ERROR},
{SERVER_CANNOT_CREATE_FOLDER, thrift::ErrorCode::CANNOT_CREATE_FOLDER},
{SERVER_CANNOT_CREATE_FILE, thrift::ErrorCode::CANNOT_CREATE_FILE},
{SERVER_CANNOT_DELETE_FOLDER, thrift::ErrorCode::CANNOT_DELETE_FOLDER},
{SERVER_CANNOT_DELETE_FILE, thrift::ErrorCode::CANNOT_DELETE_FILE},
{SERVER_TABLE_NOT_EXIST, thrift::ErrorCode::TABLE_NOT_EXISTS}, {SERVER_TABLE_NOT_EXIST, thrift::ErrorCode::TABLE_NOT_EXISTS},
{SERVER_INVALID_TABLE_NAME, thrift::ErrorCode::ILLEGAL_TABLE_NAME},
{SERVER_INVALID_TABLE_DIMENSION, thrift::ErrorCode::ILLEGAL_DIMENSION},
{SERVER_INVALID_TIME_RANGE, thrift::ErrorCode::ILLEGAL_RANGE}, {SERVER_INVALID_TIME_RANGE, thrift::ErrorCode::ILLEGAL_RANGE},
{SERVER_INVALID_VECTOR_DIMENSION, thrift::ErrorCode::ILLEGAL_DIMENSION}, {SERVER_INVALID_VECTOR_DIMENSION, thrift::ErrorCode::ILLEGAL_DIMENSION},
};
return code_map; {SERVER_INVALID_INDEX_TYPE, thrift::ErrorCode::ILLEGAL_INDEX_TYPE},
} {SERVER_INVALID_ROWRECORD, thrift::ErrorCode::ILLEGAL_ROWRECORD},
{SERVER_INVALID_ROWRECORD_ARRAY, thrift::ErrorCode::ILLEGAL_ROWRECORD},
const std::map<ServerError, std::string> &ErrorMessage() { {SERVER_INVALID_TOPK, thrift::ErrorCode::ILLEGAL_TOPK},
static const std::map<ServerError, std::string> msg_map = { {SERVER_ILLEGAL_VECTOR_ID, thrift::ErrorCode::ILLEGAL_VECTOR_ID},
{SERVER_UNEXPECTED_ERROR, "unexpected error occurs"}, {SERVER_ILLEGAL_SEARCH_RESULT, thrift::ErrorCode::ILLEGAL_SEARCH_RESULT},
{SERVER_NULL_POINTER, "null pointer error"}, {SERVER_CACHE_ERROR, thrift::ErrorCode::CACHE_FAILED},
{SERVER_INVALID_ARGUMENT, "invalid argument"}, {DB_META_TRANSACTION_FAILED, thrift::ErrorCode::META_FAILED},
{SERVER_FILE_NOT_FOUND, "file not found"},
{SERVER_NOT_IMPLEMENT, "not implemented"},
{SERVER_BLOCKING_QUEUE_EMPTY, "queue empty"},
{SERVER_TABLE_NOT_EXIST, "table not exist"},
{SERVER_INVALID_TIME_RANGE, "invalid time range"},
{SERVER_INVALID_VECTOR_DIMENSION, "invalid vector dimension"},
}; };
return msg_map; return code_map;
} }
} }
...@@ -69,6 +69,14 @@ ServerError BaseTask::Execute() { ...@@ -69,6 +69,14 @@ ServerError BaseTask::Execute() {
return error_code_; return error_code_;
} }
ServerError BaseTask::SetError(ServerError error_code, const std::string& error_msg) {
error_code_ = error_code;
error_msg_ = error_msg;
SERVER_LOG_ERROR << error_msg_;
return error_code_;
}
ServerError BaseTask::WaitToFinish() { ServerError BaseTask::WaitToFinish() {
std::unique_lock <std::mutex> lock(finish_mtx_); std::unique_lock <std::mutex> lock(finish_mtx_);
finish_cond_.wait(lock, [this] { return done_; }); finish_cond_.wait(lock, [this] { return done_; });
...@@ -102,7 +110,7 @@ void RequestScheduler::ExecTask(BaseTaskPtr& task_ptr) { ...@@ -102,7 +110,7 @@ void RequestScheduler::ExecTask(BaseTaskPtr& task_ptr) {
ex.__set_code(ErrorMap().at(err)); ex.__set_code(ErrorMap().at(err));
std::string msg = task_ptr->ErrorMsg(); std::string msg = task_ptr->ErrorMsg();
if(msg.empty()){ if(msg.empty()){
msg = ErrorMessage().at(err); msg = "Error message not set";
} }
ex.__set_reason(msg); ex.__set_reason(msg);
throw ex; throw ex;
......
cpp/src/server/RequestScheduler.h
浏览文件 @ 41bfe4bf
...@@ -34,6 +34,8 @@ public: ...@@ -34,6 +34,8 @@ public:
protected: protected:
virtual ServerError OnExecute() = 0; virtual ServerError OnExecute() = 0;
ServerError SetError(ServerError error_code, const std::string& msg);
protected: protected:
mutable std::mutex finish_mtx_; mutable std::mutex finish_mtx_;
std::condition_variable finish_cond_; std::condition_variable finish_cond_;
......
cpp/src/server/RequestTask.cpp
浏览文件 @ 41bfe4bf
...@@ -53,26 +53,27 @@ namespace { ...@@ -53,26 +53,27 @@ namespace {
return map_type[type]; return map_type[type];
} }
ServerError void
ConvertRowRecordToFloatArray(const std::vector<thrift::RowRecord>& record_array, ConvertRowRecordToFloatArray(const std::vector<thrift::RowRecord>& record_array,
uint64_t dimension, uint64_t dimension,
std::vector<float>& float_array) { std::vector<float>& float_array,
ServerError error_code; ServerError& error_code,
std::string& error_msg) {
uint64_t vec_count = record_array.size(); uint64_t vec_count = record_array.size();
float_array.resize(vec_count*dimension);//allocate enough memory float_array.resize(vec_count*dimension);//allocate enough memory
for(uint64_t i = 0; i < vec_count; i++) { for(uint64_t i = 0; i < vec_count; i++) {
const auto& record = record_array[i]; const auto& record = record_array[i];
if(record.vector_data.empty()) { if(record.vector_data.empty()) {
error_code = SERVER_INVALID_ARGUMENT; error_code = SERVER_INVALID_ROWRECORD;
SERVER_LOG_ERROR << "No vector provided in record"; error_msg = "Rowrecord float array is empty";
return error_code; return;
} }
uint64_t vec_dim = record.vector_data.size()/sizeof(double);//how many double value? uint64_t vec_dim = record.vector_data.size()/sizeof(double);//how many double value?
if(vec_dim != dimension) { if(vec_dim != dimension) {
SERVER_LOG_ERROR << "Invalid vector dimension: " << vec_dim
<< " vs. table dimension:" << dimension;
error_code = SERVER_INVALID_VECTOR_DIMENSION; error_code = SERVER_INVALID_VECTOR_DIMENSION;
return error_code; error_msg = "Invalid rowrecord dimension: " + std::to_string(vec_dim)
+ " vs. table dimension:" + std::to_string(dimension);
return;
} }
//convert double array to float array(thrift has no float type) //convert double array to float array(thrift has no float type)
...@@ -81,30 +82,29 @@ namespace { ...@@ -81,30 +82,29 @@ namespace {
float_array[i*vec_dim + d] = (float)(d_p[d]); float_array[i*vec_dim + d] = (float)(d_p[d]);
} }
} }
return SERVER_SUCCESS;
} }
static constexpr long DAY_SECONDS = 86400; static constexpr long DAY_SECONDS = 86400;
ServerError void
ConvertTimeRangeToDBDates(const std::vector<thrift::Range> &range_array, ConvertTimeRangeToDBDates(const std::vector<thrift::Range> &range_array,
std::vector<DB_DATE>& dates) { std::vector<DB_DATE>& dates,
ServerError& error_code,
std::string& error_msg) {
dates.clear(); dates.clear();
ServerError error_code;
for(auto& range : range_array) { for(auto& range : range_array) {
time_t tt_start, tt_end; time_t tt_start, tt_end;
tm tm_start, tm_end; tm tm_start, tm_end;
if(!CommonUtil::TimeStrToTime(range.start_value, tt_start, tm_start)){ if(!CommonUtil::TimeStrToTime(range.start_value, tt_start, tm_start)){
error_code = SERVER_INVALID_TIME_RANGE; error_code = SERVER_INVALID_TIME_RANGE;
SERVER_LOG_ERROR << "Invalid time range: " << range.start_value; error_msg = "Invalid time range: " + range.start_value;
return error_code; return;
} }
if(!CommonUtil::TimeStrToTime(range.end_value, tt_end, tm_end)){ if(!CommonUtil::TimeStrToTime(range.end_value, tt_end, tm_end)){
error_code = SERVER_INVALID_TIME_RANGE; error_code = SERVER_INVALID_TIME_RANGE;
SERVER_LOG_ERROR << "Invalid time range: " << range.end_value; error_msg = "Invalid time range: " + range.start_value;
return error_code; return;
} }
long days = (tt_end > tt_start) ? (tt_end - tt_start)/DAY_SECONDS : (tt_start - tt_end)/DAY_SECONDS; long days = (tt_end > tt_start) ? (tt_end - tt_start)/DAY_SECONDS : (tt_start - tt_end)/DAY_SECONDS;
...@@ -117,8 +117,6 @@ namespace { ...@@ -117,8 +117,6 @@ namespace {
dates.push_back(date); dates.push_back(date);
} }
} }
return SERVER_SUCCESS;
} }
} }
...@@ -138,19 +136,16 @@ ServerError CreateTableTask::OnExecute() { ...@@ -138,19 +136,16 @@ ServerError CreateTableTask::OnExecute() {
try { try {
//step 1: check arguments //step 1: check arguments
if(schema_.table_name.empty() || schema_.dimension <= 0) { if(schema_.table_name.empty()) {
error_code_ = SERVER_INVALID_ARGUMENT; return SetError(SERVER_INVALID_TABLE_NAME, "Empty table name");
error_msg_ = "Invalid table name or dimension"; }
SERVER_LOG_ERROR << error_msg_; if(schema_.dimension <= 0) {
return error_code_; return SetError(SERVER_INVALID_TABLE_DIMENSION, "Invalid table dimension: " + std::to_string(schema_.dimension));
} }
engine::EngineType engine_type = EngineType(schema_.index_type); engine::EngineType engine_type = EngineType(schema_.index_type);
if(engine_type == engine::EngineType::INVALID) { if(engine_type == engine::EngineType::INVALID) {
error_code_ = SERVER_INVALID_ARGUMENT; return SetError(SERVER_INVALID_INDEX_TYPE, "Invalid index type: " + std::to_string(schema_.index_type));
error_msg_ = "Invalid index type";
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
//step 2: construct table schema //step 2: construct table schema
...@@ -163,17 +158,11 @@ ServerError CreateTableTask::OnExecute() { ...@@ -163,17 +158,11 @@ ServerError CreateTableTask::OnExecute() {
//step 3: create table //step 3: create table
engine::Status stat = DBWrapper::DB()->CreateTable(table_info); engine::Status stat = DBWrapper::DB()->CreateTable(table_info);
if(!stat.ok()) {//table could exist if(!stat.ok()) {//table could exist
error_code_ = SERVER_UNEXPECTED_ERROR; return SetError(DB_META_TRANSACTION_FAILED, "Engine failed: " + stat.ToString());
error_msg_ = "Engine failed: " + stat.ToString();
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
} catch (std::exception& ex) { } catch (std::exception& ex) {
error_code_ = SERVER_UNEXPECTED_ERROR; return SetError(SERVER_UNEXPECTED_ERROR, ex.what());
error_msg_ = ex.what();
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
rc.Record("done"); rc.Record("done");
...@@ -199,10 +188,7 @@ ServerError DescribeTableTask::OnExecute() { ...@@ -199,10 +188,7 @@ ServerError DescribeTableTask::OnExecute() {
try { try {
//step 1: check arguments //step 1: check arguments
if(table_name_.empty()) { if(table_name_.empty()) {
error_code_ = SERVER_INVALID_ARGUMENT; return SetError(SERVER_INVALID_TABLE_NAME, "Empty table name");
error_msg_ = "Table name cannot be empty";
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
//step 2: get table info //step 2: get table info
...@@ -210,10 +196,7 @@ ServerError DescribeTableTask::OnExecute() { ...@@ -210,10 +196,7 @@ ServerError DescribeTableTask::OnExecute() {
table_info.table_id_ = table_name_; table_info.table_id_ = table_name_;
engine::Status stat = DBWrapper::DB()->DescribeTable(table_info); engine::Status stat = DBWrapper::DB()->DescribeTable(table_info);
if(!stat.ok()) { if(!stat.ok()) {
error_code_ = SERVER_TABLE_NOT_EXIST; return SetError(DB_META_TRANSACTION_FAILED, "Engine failed: " + stat.ToString());
error_msg_ = "Engine failed: " + stat.ToString();
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
schema_.table_name = table_info.table_id_; schema_.table_name = table_info.table_id_;
...@@ -222,10 +205,7 @@ ServerError DescribeTableTask::OnExecute() { ...@@ -222,10 +205,7 @@ ServerError DescribeTableTask::OnExecute() {
schema_.store_raw_vector = table_info.store_raw_data_; schema_.store_raw_vector = table_info.store_raw_data_;
} catch (std::exception& ex) { } catch (std::exception& ex) {
error_code_ = SERVER_UNEXPECTED_ERROR; return SetError(SERVER_UNEXPECTED_ERROR, ex.what());
error_msg_ = ex.what();
SERVER_LOG_ERROR << error_msg_;
return SERVER_UNEXPECTED_ERROR;
} }
rc.Record("done"); rc.Record("done");
...@@ -250,22 +230,19 @@ ServerError HasTableTask::OnExecute() { ...@@ -250,22 +230,19 @@ ServerError HasTableTask::OnExecute() {
TimeRecorder rc("HasTableTask"); TimeRecorder rc("HasTableTask");
//step 1: check arguments //step 1: check arguments
if (table_name_.empty()) { if(table_name_.empty()) {
error_code_ = SERVER_INVALID_ARGUMENT; return SetError(SERVER_INVALID_TABLE_NAME, "Empty table name");
error_msg_ = "Table name cannot be empty";
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
//step 2: check table existence //step 2: check table existence
engine::Status stat = DBWrapper::DB()->HasTable(table_name_, has_table_); engine::Status stat = DBWrapper::DB()->HasTable(table_name_, has_table_);
if(!stat.ok()) {
return SetError(DB_META_TRANSACTION_FAILED, "Engine failed: " + stat.ToString());
}
rc.Elapse("totally cost"); rc.Elapse("totally cost");
} catch (std::exception& ex) { } catch (std::exception& ex) {
error_code_ = SERVER_UNEXPECTED_ERROR; return SetError(SERVER_UNEXPECTED_ERROR, ex.what());
error_msg_ = ex.what();
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
return SERVER_SUCCESS; return SERVER_SUCCESS;
...@@ -288,10 +265,7 @@ ServerError DeleteTableTask::OnExecute() { ...@@ -288,10 +265,7 @@ ServerError DeleteTableTask::OnExecute() {
//step 1: check arguments //step 1: check arguments
if (table_name_.empty()) { if (table_name_.empty()) {
error_code_ = SERVER_INVALID_ARGUMENT; return SetError(SERVER_INVALID_TABLE_NAME, "Empty table name");
error_msg_ = "Table name cannot be empty";
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
//step 2: check table existence //step 2: check table existence
...@@ -299,10 +273,11 @@ ServerError DeleteTableTask::OnExecute() { ...@@ -299,10 +273,11 @@ ServerError DeleteTableTask::OnExecute() {
table_info.table_id_ = table_name_; table_info.table_id_ = table_name_;
engine::Status stat = DBWrapper::DB()->DescribeTable(table_info); engine::Status stat = DBWrapper::DB()->DescribeTable(table_info);
if(!stat.ok()) { if(!stat.ok()) {
error_code_ = SERVER_TABLE_NOT_EXIST; if(stat.IsNotFound()) {
error_msg_ = "Engine failed: " + stat.ToString(); return SetError(SERVER_TABLE_NOT_EXIST, "Table " + table_name_ + " not exists");
SERVER_LOG_ERROR << error_msg_; } else {
return error_code_; return SetError(DB_META_TRANSACTION_FAILED, "Engine failed: " + stat.ToString());
}
} }
rc.Record("check validation"); rc.Record("check validation");
...@@ -311,17 +286,13 @@ ServerError DeleteTableTask::OnExecute() { ...@@ -311,17 +286,13 @@ ServerError DeleteTableTask::OnExecute() {
std::vector<DB_DATE> dates; std::vector<DB_DATE> dates;
stat = DBWrapper::DB()->DeleteTable(table_name_, dates); stat = DBWrapper::DB()->DeleteTable(table_name_, dates);
if(!stat.ok()) { if(!stat.ok()) {
SERVER_LOG_ERROR << "Engine failed: " << stat.ToString(); return SetError(DB_META_TRANSACTION_FAILED, "Engine failed: " + stat.ToString());
return SERVER_UNEXPECTED_ERROR;
} }
rc.Record("deleta table"); rc.Record("deleta table");
rc.Elapse("totally cost"); rc.Elapse("totally cost");
} catch (std::exception& ex) { } catch (std::exception& ex) {
error_code_ = SERVER_UNEXPECTED_ERROR; return SetError(SERVER_UNEXPECTED_ERROR, ex.what());
error_msg_ = ex.what();
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
return SERVER_SUCCESS; return SERVER_SUCCESS;
...@@ -342,10 +313,7 @@ ServerError ShowTablesTask::OnExecute() { ...@@ -342,10 +313,7 @@ ServerError ShowTablesTask::OnExecute() {
std::vector<engine::meta::TableSchema> schema_array; std::vector<engine::meta::TableSchema> schema_array;
engine::Status stat = DBWrapper::DB()->AllTables(schema_array); engine::Status stat = DBWrapper::DB()->AllTables(schema_array);
if(!stat.ok()) { if(!stat.ok()) {
error_code_ = SERVER_UNEXPECTED_ERROR; return SetError(DB_META_TRANSACTION_FAILED, "Engine failed: " + stat.ToString());
error_msg_ = "Engine failed: " + stat.ToString();
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
tables_.clear(); tables_.clear();
...@@ -379,17 +347,11 @@ ServerError AddVectorTask::OnExecute() { ...@@ -379,17 +347,11 @@ ServerError AddVectorTask::OnExecute() {
//step 1: check arguments //step 1: check arguments
if (table_name_.empty()) { if (table_name_.empty()) {
error_code_ = SERVER_INVALID_ARGUMENT; return SetError(SERVER_INVALID_TABLE_NAME, "Empty table name");
error_msg_ = "Table name cannot be empty";
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
if(record_array_.empty()) { if(record_array_.empty()) {
error_code_ = SERVER_INVALID_ARGUMENT; return SetError(SERVER_INVALID_ROWRECORD_ARRAY, "Row record array is empty");
error_msg_ = "Row record array is empty";
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
//step 2: check table existence //step 2: check table existence
...@@ -397,20 +359,22 @@ ServerError AddVectorTask::OnExecute() { ...@@ -397,20 +359,22 @@ ServerError AddVectorTask::OnExecute() {
table_info.table_id_ = table_name_; table_info.table_id_ = table_name_;
engine::Status stat = DBWrapper::DB()->DescribeTable(table_info); engine::Status stat = DBWrapper::DB()->DescribeTable(table_info);
if(!stat.ok()) { if(!stat.ok()) {
error_code_ = SERVER_TABLE_NOT_EXIST; if(stat.IsNotFound()) {
error_msg_ = "Engine failed: " + stat.ToString(); return SetError(SERVER_TABLE_NOT_EXIST, "Table " + table_name_ + " not exists");
SERVER_LOG_ERROR << error_msg_; } else {
return error_code_; return SetError(DB_META_TRANSACTION_FAILED, "Engine failed: " + stat.ToString());
}
} }
rc.Record("check validation"); rc.Record("check validation");
//step 3: prepare float data //step 3: prepare float data
std::vector<float> vec_f; std::vector<float> vec_f;
error_code_ = ConvertRowRecordToFloatArray(record_array_, table_info.dimension_, vec_f); ServerError error_code = SERVER_SUCCESS;
if(error_code_ != SERVER_SUCCESS) { std::string error_msg;
error_msg_ = "Invalid row record data"; ConvertRowRecordToFloatArray(record_array_, table_info.dimension_, vec_f, error_code, error_msg);
return error_code_; if(error_code != SERVER_SUCCESS) {
return SetError(error_code, error_msg);
} }
rc.Record("prepare vectors data"); rc.Record("prepare vectors data");
...@@ -420,25 +384,20 @@ ServerError AddVectorTask::OnExecute() { ...@@ -420,25 +384,20 @@ ServerError AddVectorTask::OnExecute() {
stat = DBWrapper::DB()->InsertVectors(table_name_, vec_count, vec_f.data(), record_ids_); stat = DBWrapper::DB()->InsertVectors(table_name_, vec_count, vec_f.data(), record_ids_);
rc.Record("add vectors to engine"); rc.Record("add vectors to engine");
if(!stat.ok()) { if(!stat.ok()) {
error_code_ = SERVER_UNEXPECTED_ERROR; return SetError(SERVER_CACHE_ERROR, "Cache error: " + stat.ToString());
error_msg_ = "Engine failed: " + stat.ToString();
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
if(record_ids_.size() != vec_count) { if(record_ids_.size() != vec_count) {
SERVER_LOG_ERROR << "Vector ID not returned"; std::string msg = "Add " + std::to_string(vec_count) + " vectors but only return "
return SERVER_UNEXPECTED_ERROR; + std::to_string(record_ids_.size()) + " id";
return SetError(SERVER_ILLEGAL_VECTOR_ID, msg);
} }
rc.Record("do insert"); rc.Record("do insert");
rc.Elapse("totally cost"); rc.Elapse("totally cost");
} catch (std::exception& ex) { } catch (std::exception& ex) {
error_code_ = SERVER_UNEXPECTED_ERROR; return SetError(SERVER_UNEXPECTED_ERROR, ex.what());
error_msg_ = ex.what();
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
return SERVER_SUCCESS; return SERVER_SUCCESS;
...@@ -477,17 +436,14 @@ ServerError SearchVectorTask::OnExecute() { ...@@ -477,17 +436,14 @@ ServerError SearchVectorTask::OnExecute() {
//step 1: check arguments //step 1: check arguments
if (table_name_.empty()) { if (table_name_.empty()) {
error_code_ = SERVER_INVALID_ARGUMENT; return SetError(SERVER_INVALID_TABLE_NAME, "Empty table name");
error_msg_ = "Table name cannot be empty";
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
if(top_k_ <= 0 || record_array_.empty()) { if(top_k_ <= 0) {
error_code_ = SERVER_INVALID_ARGUMENT; return SetError(SERVER_INVALID_TOPK, "Invalid topk: " + std::to_string(top_k_));
error_msg_ = "Invalid topk value, or query record array is empty"; }
SERVER_LOG_ERROR << error_msg_; if(record_array_.empty()) {
return error_code_; return SetError(SERVER_INVALID_ROWRECORD_ARRAY, "Row record array is empty");
} }
//step 2: check table existence //step 2: check table existence
...@@ -495,28 +451,29 @@ ServerError SearchVectorTask::OnExecute() { ...@@ -495,28 +451,29 @@ ServerError SearchVectorTask::OnExecute() {
table_info.table_id_ = table_name_; table_info.table_id_ = table_name_;
engine::Status stat = DBWrapper::DB()->DescribeTable(table_info); engine::Status stat = DBWrapper::DB()->DescribeTable(table_info);
if(!stat.ok()) { if(!stat.ok()) {
error_code_ = SERVER_TABLE_NOT_EXIST; if(stat.IsNotFound()) {
error_msg_ = "Engine failed: " + stat.ToString(); return SetError(SERVER_TABLE_NOT_EXIST, "Table " + table_name_ + " not exists");
SERVER_LOG_ERROR << error_msg_; } else {
return error_code_; return SetError(DB_META_TRANSACTION_FAILED, "Engine failed: " + stat.ToString());
}
} }
//step 3: check date range, and convert to db dates //step 3: check date range, and convert to db dates
std::vector<DB_DATE> dates; std::vector<DB_DATE> dates;
error_code_ = ConvertTimeRangeToDBDates(range_array_, dates); ServerError error_code = SERVER_SUCCESS;
if(error_code_ != SERVER_SUCCESS) { std::string error_msg;
error_msg_ = "Invalid query range"; ConvertTimeRangeToDBDates(range_array_, dates, error_code, error_msg);
return error_code_; if(error_code != SERVER_SUCCESS) {
return SetError(error_code, error_msg);
} }
rc.Record("check validation"); rc.Record("check validation");
//step 3: prepare float data //step 3: prepare float data
std::vector<float> vec_f; std::vector<float> vec_f;
error_code_ = ConvertRowRecordToFloatArray(record_array_, table_info.dimension_, vec_f); ConvertRowRecordToFloatArray(record_array_, table_info.dimension_, vec_f, error_code, error_msg);
if(error_code_ != SERVER_SUCCESS) { if(error_code != SERVER_SUCCESS) {
error_msg_ = "Invalid row record data"; return SetError(error_code, error_msg);
return error_code_;
} }
rc.Record("prepare vector data"); rc.Record("prepare vector data");
...@@ -533,13 +490,17 @@ ServerError SearchVectorTask::OnExecute() { ...@@ -533,13 +490,17 @@ ServerError SearchVectorTask::OnExecute() {
rc.Record("search vectors from engine"); rc.Record("search vectors from engine");
if(!stat.ok()) { if(!stat.ok()) {
SERVER_LOG_ERROR << "Engine failed: " << stat.ToString(); return SetError(DB_META_TRANSACTION_FAILED, "Engine failed: " + stat.ToString());
return SERVER_UNEXPECTED_ERROR; }
if(results.empty()) {
return SERVER_SUCCESS; //empty table
} }
if(results.size() != record_count) { if(results.size() != record_count) {
SERVER_LOG_ERROR << "Search result not returned"; std::string msg = "Search " + std::to_string(record_count) + " vectors but only return "
return SERVER_UNEXPECTED_ERROR; + std::to_string(results.size()) + " results";
return SetError(SERVER_ILLEGAL_SEARCH_RESULT, msg);
} }
rc.Record("do search"); rc.Record("do search");
...@@ -564,10 +525,7 @@ ServerError SearchVectorTask::OnExecute() { ...@@ -564,10 +525,7 @@ ServerError SearchVectorTask::OnExecute() {
rc.Elapse("totally cost"); rc.Elapse("totally cost");
} catch (std::exception& ex) { } catch (std::exception& ex) {
error_code_ = SERVER_UNEXPECTED_ERROR; return SetError(SERVER_UNEXPECTED_ERROR, ex.what());
error_msg_ = ex.what();
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
return SERVER_SUCCESS; return SERVER_SUCCESS;
...@@ -591,20 +549,14 @@ ServerError GetTableRowCountTask::OnExecute() { ...@@ -591,20 +549,14 @@ ServerError GetTableRowCountTask::OnExecute() {
//step 1: check arguments //step 1: check arguments
if (table_name_.empty()) { if (table_name_.empty()) {
error_code_ = SERVER_INVALID_ARGUMENT; return SetError(SERVER_INVALID_TABLE_NAME, "Empty table name");
error_msg_ = "Table name cannot be empty";
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
//step 2: get row count //step 2: get row count
uint64_t row_count = 0; uint64_t row_count = 0;
engine::Status stat = DBWrapper::DB()->GetTableRowCount(table_name_, row_count); engine::Status stat = DBWrapper::DB()->GetTableRowCount(table_name_, row_count);
if (!stat.ok()) { if (!stat.ok()) {
error_code_ = SERVER_UNEXPECTED_ERROR; return SetError(DB_META_TRANSACTION_FAILED, "Engine failed: " + stat.ToString());
error_msg_ = "Engine failed: " + stat.ToString();
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
row_count_ = (int64_t) row_count; row_count_ = (int64_t) row_count;
...@@ -612,10 +564,7 @@ ServerError GetTableRowCountTask::OnExecute() { ...@@ -612,10 +564,7 @@ ServerError GetTableRowCountTask::OnExecute() {
rc.Elapse("totally cost"); rc.Elapse("totally cost");
} catch (std::exception& ex) { } catch (std::exception& ex) {
error_code_ = SERVER_UNEXPECTED_ERROR; return SetError(SERVER_UNEXPECTED_ERROR, ex.what());
error_msg_ = ex.what();
SERVER_LOG_ERROR << error_msg_;
return error_code_;
} }
return SERVER_SUCCESS; return SERVER_SUCCESS;
......
cpp/src/thrift/gen-cpp/milvus_types.cpp
浏览文件 @ 41bfe4bf
...@@ -15,23 +15,51 @@ namespace milvus { namespace thrift { ...@@ -15,23 +15,51 @@ namespace milvus { namespace thrift {
int _kErrorCodeValues[] = { int _kErrorCodeValues[] = {
ErrorCode::SUCCESS, ErrorCode::SUCCESS,
ErrorCode::UNEXPECTED_ERROR,
ErrorCode::CONNECT_FAILED, ErrorCode::CONNECT_FAILED,
ErrorCode::PERMISSION_DENIED, ErrorCode::PERMISSION_DENIED,
ErrorCode::TABLE_NOT_EXISTS, ErrorCode::TABLE_NOT_EXISTS,
ErrorCode::ILLEGAL_ARGUMENT, ErrorCode::ILLEGAL_ARGUMENT,
ErrorCode::ILLEGAL_RANGE, ErrorCode::ILLEGAL_RANGE,
ErrorCode::ILLEGAL_DIMENSION ErrorCode::ILLEGAL_DIMENSION,
ErrorCode::ILLEGAL_INDEX_TYPE,
ErrorCode::ILLEGAL_TABLE_NAME,
ErrorCode::ILLEGAL_TOPK,
ErrorCode::ILLEGAL_ROWRECORD,
ErrorCode::ILLEGAL_VECTOR_ID,
ErrorCode::ILLEGAL_SEARCH_RESULT,
ErrorCode::FILE_NOT_FOUND,
ErrorCode::META_FAILED,
ErrorCode::CACHE_FAILED,
ErrorCode::CANNOT_CREATE_FOLDER,
ErrorCode::CANNOT_CREATE_FILE,
ErrorCode::CANNOT_DELETE_FOLDER,
ErrorCode::CANNOT_DELETE_FILE
}; };
const char* _kErrorCodeNames[] = { const char* _kErrorCodeNames[] = {
"SUCCESS", "SUCCESS",
"UNEXPECTED_ERROR",
"CONNECT_FAILED", "CONNECT_FAILED",
"PERMISSION_DENIED", "PERMISSION_DENIED",
"TABLE_NOT_EXISTS", "TABLE_NOT_EXISTS",
"ILLEGAL_ARGUMENT", "ILLEGAL_ARGUMENT",
"ILLEGAL_RANGE", "ILLEGAL_RANGE",
"ILLEGAL_DIMENSION" "ILLEGAL_DIMENSION",
"ILLEGAL_INDEX_TYPE",
"ILLEGAL_TABLE_NAME",
"ILLEGAL_TOPK",
"ILLEGAL_ROWRECORD",
"ILLEGAL_VECTOR_ID",
"ILLEGAL_SEARCH_RESULT",
"FILE_NOT_FOUND",
"META_FAILED",
"CACHE_FAILED",
"CANNOT_CREATE_FOLDER",
"CANNOT_CREATE_FILE",
"CANNOT_DELETE_FOLDER",
"CANNOT_DELETE_FILE"
}; };
const std::map<int, const char*> _ErrorCode_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(7, _kErrorCodeValues, _kErrorCodeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL)); const std::map<int, const char*> _ErrorCode_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(21, _kErrorCodeValues, _kErrorCodeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
std::ostream& operator<<(std::ostream& out, const ErrorCode::type& val) { std::ostream& operator<<(std::ostream& out, const ErrorCode::type& val) {
std::map<int, const char*>::const_iterator it = _ErrorCode_VALUES_TO_NAMES.find(val); std::map<int, const char*>::const_iterator it = _ErrorCode_VALUES_TO_NAMES.find(val);
......
cpp/src/thrift/gen-cpp/milvus_types.h
浏览文件 @ 41bfe4bf
...@@ -23,12 +23,26 @@ namespace milvus { namespace thrift { ...@@ -23,12 +23,26 @@ namespace milvus { namespace thrift {
struct ErrorCode { struct ErrorCode {
enum type { enum type {
SUCCESS = 0, SUCCESS = 0,
CONNECT_FAILED = 1, UNEXPECTED_ERROR = 1,
PERMISSION_DENIED = 2, CONNECT_FAILED = 2,
TABLE_NOT_EXISTS = 3, PERMISSION_DENIED = 3,
ILLEGAL_ARGUMENT = 4, TABLE_NOT_EXISTS = 4,
ILLEGAL_RANGE = 5, ILLEGAL_ARGUMENT = 5,
ILLEGAL_DIMENSION = 6 ILLEGAL_RANGE = 6,
ILLEGAL_DIMENSION = 7,
ILLEGAL_INDEX_TYPE = 8,
ILLEGAL_TABLE_NAME = 9,
ILLEGAL_TOPK = 10,
ILLEGAL_ROWRECORD = 11,
ILLEGAL_VECTOR_ID = 12,
ILLEGAL_SEARCH_RESULT = 13,
FILE_NOT_FOUND = 14,
META_FAILED = 15,
CACHE_FAILED = 16,
CANNOT_CREATE_FOLDER = 17,
CANNOT_CREATE_FILE = 18,
CANNOT_DELETE_FOLDER = 19,
CANNOT_DELETE_FILE = 20
}; };
}; };
......
cpp/src/thrift/milvus.thrift
浏览文件 @ 41bfe4bf
...@@ -15,12 +15,26 @@ namespace netcore milvus.thrift ...@@ -15,12 +15,26 @@ namespace netcore milvus.thrift
enum ErrorCode { enum ErrorCode {
SUCCESS = 0, SUCCESS = 0,
UNEXPECTED_ERROR,
CONNECT_FAILED, CONNECT_FAILED,
PERMISSION_DENIED, PERMISSION_DENIED,
TABLE_NOT_EXISTS, TABLE_NOT_EXISTS,
ILLEGAL_ARGUMENT, ILLEGAL_ARGUMENT,
ILLEGAL_RANGE, ILLEGAL_RANGE,
ILLEGAL_DIMENSION, ILLEGAL_DIMENSION,
ILLEGAL_INDEX_TYPE,
ILLEGAL_TABLE_NAME,
ILLEGAL_TOPK,
ILLEGAL_ROWRECORD,
ILLEGAL_VECTOR_ID,
ILLEGAL_SEARCH_RESULT,
FILE_NOT_FOUND,
META_FAILED,
CACHE_FAILED,
CANNOT_CREATE_FOLDER,
CANNOT_CREATE_FILE,
CANNOT_DELETE_FOLDER,
CANNOT_DELETE_FILE,
} }
exception Exception { exception Exception {
......
cpp/src/utils/Error.h
浏览文件 @ 41bfe4bf
...@@ -24,18 +24,35 @@ ToGlobalServerErrorCode(const ServerError error_code) { ...@@ -24,18 +24,35 @@ ToGlobalServerErrorCode(const ServerError error_code) {
return SERVER_ERROR_CODE_BASE + error_code; return SERVER_ERROR_CODE_BASE + error_code;
} }
constexpr ServerError SERVER_UNEXPECTED_ERROR = ToGlobalServerErrorCode(0x001); constexpr ServerError SERVER_UNEXPECTED_ERROR = ToGlobalServerErrorCode(1);
constexpr ServerError SERVER_UNSUPPORTED_ERROR = ToGlobalServerErrorCode(0x002); constexpr ServerError SERVER_UNSUPPORTED_ERROR = ToGlobalServerErrorCode(2);
constexpr ServerError SERVER_NULL_POINTER = ToGlobalServerErrorCode(0x003); constexpr ServerError SERVER_NULL_POINTER = ToGlobalServerErrorCode(3);
constexpr ServerError SERVER_INVALID_ARGUMENT = ToGlobalServerErrorCode(0x004); constexpr ServerError SERVER_INVALID_ARGUMENT = ToGlobalServerErrorCode(4);
constexpr ServerError SERVER_FILE_NOT_FOUND = ToGlobalServerErrorCode(0x005); constexpr ServerError SERVER_FILE_NOT_FOUND = ToGlobalServerErrorCode(5);
constexpr ServerError SERVER_NOT_IMPLEMENT = ToGlobalServerErrorCode(0x006); constexpr ServerError SERVER_NOT_IMPLEMENT = ToGlobalServerErrorCode(6);
constexpr ServerError SERVER_BLOCKING_QUEUE_EMPTY = ToGlobalServerErrorCode(0x007); constexpr ServerError SERVER_BLOCKING_QUEUE_EMPTY = ToGlobalServerErrorCode(7);
constexpr ServerError SERVER_TABLE_NOT_EXIST = ToGlobalServerErrorCode(0x008); constexpr ServerError SERVER_CANNOT_CREATE_FOLDER = ToGlobalServerErrorCode(8);
constexpr ServerError SERVER_INVALID_TIME_RANGE = ToGlobalServerErrorCode(0x009); constexpr ServerError SERVER_CANNOT_CREATE_FILE = ToGlobalServerErrorCode(9);
constexpr ServerError SERVER_INVALID_VECTOR_DIMENSION = ToGlobalServerErrorCode(0x00a); constexpr ServerError SERVER_CANNOT_DELETE_FOLDER = ToGlobalServerErrorCode(10);
constexpr ServerError SERVER_LICENSE_VALIDATION_FAIL = ToGlobalServerErrorCode(0x00b); constexpr ServerError SERVER_CANNOT_DELETE_FILE = ToGlobalServerErrorCode(11);
constexpr ServerError SERVER_LICENSE_FILE_NOT_EXIST = ToGlobalServerErrorCode(0x00c);
constexpr ServerError SERVER_TABLE_NOT_EXIST = ToGlobalServerErrorCode(100);
constexpr ServerError SERVER_INVALID_TABLE_NAME = ToGlobalServerErrorCode(101);
constexpr ServerError SERVER_INVALID_TABLE_DIMENSION = ToGlobalServerErrorCode(102);
constexpr ServerError SERVER_INVALID_TIME_RANGE = ToGlobalServerErrorCode(103);
constexpr ServerError SERVER_INVALID_VECTOR_DIMENSION = ToGlobalServerErrorCode(104);
constexpr ServerError SERVER_INVALID_INDEX_TYPE = ToGlobalServerErrorCode(105);
constexpr ServerError SERVER_INVALID_ROWRECORD = ToGlobalServerErrorCode(106);
constexpr ServerError SERVER_INVALID_ROWRECORD_ARRAY = ToGlobalServerErrorCode(107);
constexpr ServerError SERVER_INVALID_TOPK = ToGlobalServerErrorCode(108);
constexpr ServerError SERVER_ILLEGAL_VECTOR_ID = ToGlobalServerErrorCode(109);
constexpr ServerError SERVER_ILLEGAL_SEARCH_RESULT = ToGlobalServerErrorCode(110);
constexpr ServerError SERVER_CACHE_ERROR = ToGlobalServerErrorCode(111);
constexpr ServerError SERVER_LICENSE_FILE_NOT_EXIST = ToGlobalServerErrorCode(500);
constexpr ServerError SERVER_LICENSE_VALIDATION_FAIL = ToGlobalServerErrorCode(501);
constexpr ServerError DB_META_TRANSACTION_FAILED = ToGlobalServerErrorCode(1000);
class ServerException : public std::exception { class ServerException : public std::exception {
public: public:
......
cpp/unittest/db/meta_tests.cpp
浏览文件 @ 41bfe4bf
...@@ -17,39 +17,39 @@ ...@@ -17,39 +17,39 @@
using namespace zilliz::milvus::engine; using namespace zilliz::milvus::engine;
TEST_F(MetaTest, GROUP_TEST) { TEST_F(MetaTest, TABLE_TEST) {
auto table_id = "meta_test_group"; auto table_id = "meta_test_table";
meta::TableSchema group; meta::TableSchema table;
group.table_id_ = table_id; table.table_id_ = table_id;
auto status = impl_->CreateTable(group); auto status = impl_->CreateTable(table);
ASSERT_TRUE(status.ok()); ASSERT_TRUE(status.ok());
auto gid = group.id_; auto gid = table.id_;
group.id_ = -1; table.id_ = -1;
status = impl_->DescribeTable(group); status = impl_->DescribeTable(table);
ASSERT_TRUE(status.ok()); ASSERT_TRUE(status.ok());
ASSERT_EQ(group.id_, gid); ASSERT_EQ(table.id_, gid);
ASSERT_EQ(group.table_id_, table_id); ASSERT_EQ(table.table_id_, table_id);
group.table_id_ = "not_found"; table.table_id_ = "not_found";
status = impl_->DescribeTable(group); status = impl_->DescribeTable(table);
ASSERT_TRUE(!status.ok()); ASSERT_TRUE(!status.ok());
group.table_id_ = table_id; table.table_id_ = table_id;
status = impl_->CreateTable(group); status = impl_->CreateTable(table);
ASSERT_TRUE(!status.ok()); ASSERT_TRUE(status.ok());
} }
TEST_F(MetaTest, table_file_TEST) { TEST_F(MetaTest, TABLE_FILE_TEST) {
auto table_id = "meta_test_group"; auto table_id = "meta_test_table";
meta::TableSchema group; meta::TableSchema table;
group.table_id_ = table_id; table.table_id_ = table_id;
auto status = impl_->CreateTable(group); auto status = impl_->CreateTable(table);
meta::TableFileSchema table_file; meta::TableFileSchema table_file;
table_file.table_id_ = group.table_id_; table_file.table_id_ = table.table_id_;
status = impl_->CreateTableFile(table_file); status = impl_->CreateTableFile(table_file);
ASSERT_TRUE(status.ok()); ASSERT_TRUE(status.ok());
ASSERT_EQ(table_file.file_type_, meta::TableFileSchema::NEW); ASSERT_EQ(table_file.file_type_, meta::TableFileSchema::NEW);
...@@ -104,15 +104,15 @@ TEST_F(MetaTest, ARCHIVE_TEST_DAYS) { ...@@ -104,15 +104,15 @@ TEST_F(MetaTest, ARCHIVE_TEST_DAYS) {
options.archive_conf = ArchiveConf("delete", ss.str()); options.archive_conf = ArchiveConf("delete", ss.str());
auto impl = meta::DBMetaImpl(options); auto impl = meta::DBMetaImpl(options);
auto table_id = "meta_test_group"; auto table_id = "meta_test_table";
meta::TableSchema group; meta::TableSchema table;
group.table_id_ = table_id; table.table_id_ = table_id;
auto status = impl.CreateTable(group); auto status = impl.CreateTable(table);
meta::TableFilesSchema files; meta::TableFilesSchema files;
meta::TableFileSchema table_file; meta::TableFileSchema table_file;
table_file.table_id_ = group.table_id_; table_file.table_id_ = table.table_id_;
auto cnt = 100; auto cnt = 100;
long ts = utils::GetMicroSecTimeStamp(); long ts = utils::GetMicroSecTimeStamp();
...@@ -156,13 +156,13 @@ TEST_F(MetaTest, ARCHIVE_TEST_DISK) { ...@@ -156,13 +156,13 @@ TEST_F(MetaTest, ARCHIVE_TEST_DISK) {
auto impl = meta::DBMetaImpl(options); auto impl = meta::DBMetaImpl(options);
auto table_id = "meta_test_group"; auto table_id = "meta_test_group";
meta::TableSchema group; meta::TableSchema table;
group.table_id_ = table_id; table.table_id_ = table_id;
auto status = impl.CreateTable(group); auto status = impl.CreateTable(table);
meta::TableFilesSchema files; meta::TableFilesSchema files;
meta::TableFileSchema table_file; meta::TableFileSchema table_file;
table_file.table_id_ = group.table_id_; table_file.table_id_ = table.table_id_;
auto cnt = 10; auto cnt = 10;
auto each_size = 2UL; auto each_size = 2UL;
...@@ -198,9 +198,9 @@ TEST_F(MetaTest, ARCHIVE_TEST_DISK) { ...@@ -198,9 +198,9 @@ TEST_F(MetaTest, ARCHIVE_TEST_DISK) {
TEST_F(MetaTest, TABLE_FILES_TEST) { TEST_F(MetaTest, TABLE_FILES_TEST) {
auto table_id = "meta_test_group"; auto table_id = "meta_test_group";
meta::TableSchema group; meta::TableSchema table;
group.table_id_ = table_id; table.table_id_ = table_id;
auto status = impl_->CreateTable(group); auto status = impl_->CreateTable(table);
int new_files_cnt = 4; int new_files_cnt = 4;
int raw_files_cnt = 5; int raw_files_cnt = 5;
...@@ -208,7 +208,7 @@ TEST_F(MetaTest, TABLE_FILES_TEST) { ...@@ -208,7 +208,7 @@ TEST_F(MetaTest, TABLE_FILES_TEST) {
int index_files_cnt = 7; int index_files_cnt = 7;
meta::TableFileSchema table_file; meta::TableFileSchema table_file;
table_file.table_id_ = group.table_id_; table_file.table_id_ = table.table_id_;
for (auto i=0; i<new_files_cnt; ++i) { for (auto i=0; i<new_files_cnt; ++i) {
status = impl_->CreateTableFile(table_file); status = impl_->CreateTableFile(table_file);
...@@ -241,7 +241,7 @@ TEST_F(MetaTest, TABLE_FILES_TEST) { ...@@ -241,7 +241,7 @@ TEST_F(MetaTest, TABLE_FILES_TEST) {
ASSERT_EQ(files.size(), to_index_files_cnt); ASSERT_EQ(files.size(), to_index_files_cnt);
meta::DatePartionedTableFilesSchema dated_files; meta::DatePartionedTableFilesSchema dated_files;
status = impl_->FilesToMerge(group.table_id_, dated_files); status = impl_->FilesToMerge(table.table_id_, dated_files);
ASSERT_TRUE(status.ok()); ASSERT_TRUE(status.ok());
ASSERT_EQ(dated_files[table_file.date_].size(), raw_files_cnt); ASSERT_EQ(dated_files[table_file.date_].size(), raw_files_cnt);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或