Skip to content

milvus
milvus

qq_35024513 / milvus
与 Fork 源项目一致

Fork自 milvus / milvus

通知 14
Star 0
Fork 0
milvus
milvus

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

提交 7ed3d0c4 编写于 作者: P peng.xu
浏览文件
操作

Merge branch 'branch-0.4.0' into 'branch-0.4.0' 

refine code

See merge request megasearch/milvus!433

Former-commit-id: fe4daf8a19b8a73d43aad172934d8aadeb83577c
上级 1b795cd4 cd36c006
展开全部 隐藏空白更改
内联 并排
Showing with 152 addition and 127 deletion
cpp/src/server/grpc_impl/GrpcRequestHandler.cpp
浏览文件 @ 7ed3d0c4
...@@ -18,7 +18,7 @@ GrpcRequestHandler::CreateTable(::grpc::ServerContext *context, ...@@ -18,7 +18,7 @@ GrpcRequestHandler::CreateTable(::grpc::ServerContext *context,
const ::milvus::grpc::TableSchema *request, const ::milvus::grpc::TableSchema *request,
::milvus::grpc::Status *response) { ::milvus::grpc::Status *response) {
BaseTaskPtr task_ptr = CreateTableTask::Create(*request); BaseTaskPtr task_ptr = CreateTableTask::Create(request);
GrpcRequestScheduler::ExecTask(task_ptr, response); GrpcRequestScheduler::ExecTask(task_ptr, response);
return ::grpc::Status::OK; return ::grpc::Status::OK;
} }
...@@ -52,7 +52,7 @@ GrpcRequestHandler::CreateIndex(::grpc::ServerContext *context, ...@@ -52,7 +52,7 @@ GrpcRequestHandler::CreateIndex(::grpc::ServerContext *context,
const ::milvus::grpc::IndexParam *request, const ::milvus::grpc::IndexParam *request,
::milvus::grpc::Status *response) { ::milvus::grpc::Status *response) {
BaseTaskPtr task_ptr = CreateIndexTask::Create(*request); BaseTaskPtr task_ptr = CreateIndexTask::Create(request);
GrpcRequestScheduler::ExecTask(task_ptr, response); GrpcRequestScheduler::ExecTask(task_ptr, response);
return ::grpc::Status::OK; return ::grpc::Status::OK;
} }
...@@ -62,7 +62,7 @@ GrpcRequestHandler::Insert(::grpc::ServerContext *context, ...@@ -62,7 +62,7 @@ GrpcRequestHandler::Insert(::grpc::ServerContext *context,
const ::milvus::grpc::InsertParam *request, const ::milvus::grpc::InsertParam *request,
::milvus::grpc::VectorIds *response) { ::milvus::grpc::VectorIds *response) {
BaseTaskPtr task_ptr = InsertTask::Create(*request, *response); BaseTaskPtr task_ptr = InsertTask::Create(request, response);
::milvus::grpc::Status grpc_status; ::milvus::grpc::Status grpc_status;
GrpcRequestScheduler::ExecTask(task_ptr, &grpc_status); GrpcRequestScheduler::ExecTask(task_ptr, &grpc_status);
response->mutable_status()->set_reason(grpc_status.reason()); response->mutable_status()->set_reason(grpc_status.reason());
...@@ -76,7 +76,7 @@ GrpcRequestHandler::Search(::grpc::ServerContext *context, ...@@ -76,7 +76,7 @@ GrpcRequestHandler::Search(::grpc::ServerContext *context,
::grpc::ServerWriter<::milvus::grpc::TopKQueryResult> *writer) { ::grpc::ServerWriter<::milvus::grpc::TopKQueryResult> *writer) {
std::vector<std::string> file_id_array; std::vector<std::string> file_id_array;
BaseTaskPtr task_ptr = SearchTask::Create(*request, file_id_array, *writer); BaseTaskPtr task_ptr = SearchTask::Create(request, file_id_array, writer);
::milvus::grpc::Status grpc_status; ::milvus::grpc::Status grpc_status;
GrpcRequestScheduler::ExecTask(task_ptr, &grpc_status); GrpcRequestScheduler::ExecTask(task_ptr, &grpc_status);
if (grpc_status.error_code() != SERVER_SUCCESS) { if (grpc_status.error_code() != SERVER_SUCCESS) {
...@@ -93,7 +93,11 @@ GrpcRequestHandler::SearchInFiles(::grpc::ServerContext *context, ...@@ -93,7 +93,11 @@ GrpcRequestHandler::SearchInFiles(::grpc::ServerContext *context,
::grpc::ServerWriter<::milvus::grpc::TopKQueryResult> *writer) { ::grpc::ServerWriter<::milvus::grpc::TopKQueryResult> *writer) {
std::vector<std::string> file_id_array; std::vector<std::string> file_id_array;
BaseTaskPtr task_ptr = SearchTask::Create(request->search_param(), file_id_array, *writer); for(int i = 0; i < request->file_id_array_size(); i++) {
file_id_array.push_back(request->file_id_array(i));
}
::milvus::grpc::SearchInFilesParam *request_mutable = const_cast<::milvus::grpc::SearchInFilesParam *>(request);
BaseTaskPtr task_ptr = SearchTask::Create(request_mutable->mutable_search_param(), file_id_array, writer);
::milvus::grpc::Status grpc_status; ::milvus::grpc::Status grpc_status;
GrpcRequestScheduler::ExecTask(task_ptr, &grpc_status); GrpcRequestScheduler::ExecTask(task_ptr, &grpc_status);
if (grpc_status.error_code() != SERVER_SUCCESS) { if (grpc_status.error_code() != SERVER_SUCCESS) {
...@@ -109,7 +113,7 @@ GrpcRequestHandler::DescribeTable(::grpc::ServerContext *context, ...@@ -109,7 +113,7 @@ GrpcRequestHandler::DescribeTable(::grpc::ServerContext *context,
const ::milvus::grpc::TableName *request, const ::milvus::grpc::TableName *request,
::milvus::grpc::TableSchema *response) { ::milvus::grpc::TableSchema *response) {
BaseTaskPtr task_ptr = DescribeTableTask::Create(request->table_name(), *response); BaseTaskPtr task_ptr = DescribeTableTask::Create(request->table_name(), response);
::milvus::grpc::Status grpc_status; ::milvus::grpc::Status grpc_status;
GrpcRequestScheduler::ExecTask(task_ptr, &grpc_status); GrpcRequestScheduler::ExecTask(task_ptr, &grpc_status);
response->mutable_table_name()->mutable_status()->set_error_code(grpc_status.error_code()); response->mutable_table_name()->mutable_status()->set_error_code(grpc_status.error_code());
...@@ -137,7 +141,7 @@ GrpcRequestHandler::ShowTables(::grpc::ServerContext *context, ...@@ -137,7 +141,7 @@ GrpcRequestHandler::ShowTables(::grpc::ServerContext *context,
const ::milvus::grpc::Command *request, const ::milvus::grpc::Command *request,
::grpc::ServerWriter<::milvus::grpc::TableName> *writer) { ::grpc::ServerWriter<::milvus::grpc::TableName> *writer) {
BaseTaskPtr task_ptr = ShowTablesTask::Create(*writer); BaseTaskPtr task_ptr = ShowTablesTask::Create(writer);
::milvus::grpc::Status grpc_status; ::milvus::grpc::Status grpc_status;
GrpcRequestScheduler::ExecTask(task_ptr, &grpc_status); GrpcRequestScheduler::ExecTask(task_ptr, &grpc_status);
if (grpc_status.error_code() != SERVER_SUCCESS) { if (grpc_status.error_code() != SERVER_SUCCESS) {
...@@ -167,7 +171,7 @@ GrpcRequestHandler::Cmd(::grpc::ServerContext *context, ...@@ -167,7 +171,7 @@ GrpcRequestHandler::Cmd(::grpc::ServerContext *context,
GrpcRequestHandler::DeleteByRange(::grpc::ServerContext *context, GrpcRequestHandler::DeleteByRange(::grpc::ServerContext *context,
const ::milvus::grpc::DeleteByRangeParam *request, const ::milvus::grpc::DeleteByRangeParam *request,
::milvus::grpc::Status *response) { ::milvus::grpc::Status *response) {
BaseTaskPtr task_ptr = DeleteByRangeTask::Create(*request); BaseTaskPtr task_ptr = DeleteByRangeTask::Create(request);
::milvus::grpc::Status grpc_status; ::milvus::grpc::Status grpc_status;
GrpcRequestScheduler::ExecTask(task_ptr, &grpc_status); GrpcRequestScheduler::ExecTask(task_ptr, &grpc_status);
response->set_error_code(grpc_status.error_code()); response->set_error_code(grpc_status.error_code());
...@@ -191,7 +195,7 @@ GrpcRequestHandler::PreloadTable(::grpc::ServerContext *context, ...@@ -191,7 +195,7 @@ GrpcRequestHandler::PreloadTable(::grpc::ServerContext *context,
GrpcRequestHandler::DescribeIndex(::grpc::ServerContext *context, GrpcRequestHandler::DescribeIndex(::grpc::ServerContext *context,
const ::milvus::grpc::TableName *request, const ::milvus::grpc::TableName *request,
::milvus::grpc::IndexParam *response) { ::milvus::grpc::IndexParam *response) {
BaseTaskPtr task_ptr = DescribeIndexTask::Create(request->table_name(), *response); BaseTaskPtr task_ptr = DescribeIndexTask::Create(request->table_name(), response);
::milvus::grpc::Status grpc_status; ::milvus::grpc::Status grpc_status;
GrpcRequestScheduler::ExecTask(task_ptr, &grpc_status); GrpcRequestScheduler::ExecTask(task_ptr, &grpc_status);
response->mutable_table_name()->mutable_status()->set_reason(grpc_status.reason()); response->mutable_table_name()->mutable_status()->set_reason(grpc_status.reason());
......
cpp/src/server/grpc_impl/GrpcRequestTask.h
浏览文件 @ 7ed3d0c4
...@@ -23,17 +23,17 @@ namespace grpc { ...@@ -23,17 +23,17 @@ namespace grpc {
class CreateTableTask : public GrpcBaseTask { class CreateTableTask : public GrpcBaseTask {
public: public:
static BaseTaskPtr static BaseTaskPtr
Create(const ::milvus::grpc::TableSchema &schema); Create(const ::milvus::grpc::TableSchema *schema);
protected: protected:
explicit explicit
CreateTableTask(const ::milvus::grpc::TableSchema &request); CreateTableTask(const ::milvus::grpc::TableSchema *request);
ServerError ServerError
OnExecute() override; OnExecute() override;
private: private:
const ::milvus::grpc::TableSchema schema_; const ::milvus::grpc::TableSchema *schema_;
}; };
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...@@ -58,10 +58,10 @@ private: ...@@ -58,10 +58,10 @@ private:
class DescribeTableTask : public GrpcBaseTask { class DescribeTableTask : public GrpcBaseTask {
public: public:
static BaseTaskPtr static BaseTaskPtr
Create(const std::string &table_name, ::milvus::grpc::TableSchema &schema); Create(const std::string &table_name, ::milvus::grpc::TableSchema *schema);
protected: protected:
DescribeTableTask(const std::string &table_name, ::milvus::grpc::TableSchema &schema); DescribeTableTask(const std::string &table_name, ::milvus::grpc::TableSchema *schema);
ServerError ServerError
OnExecute() override; OnExecute() override;
...@@ -69,7 +69,7 @@ protected: ...@@ -69,7 +69,7 @@ protected:
private: private:
std::string table_name_; std::string table_name_;
::milvus::grpc::TableSchema &schema_; ::milvus::grpc::TableSchema *schema_;
}; };
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...@@ -94,76 +94,76 @@ private: ...@@ -94,76 +94,76 @@ private:
class CreateIndexTask : public GrpcBaseTask { class CreateIndexTask : public GrpcBaseTask {
public: public:
static BaseTaskPtr static BaseTaskPtr
Create(const ::milvus::grpc::IndexParam &index_Param); Create(const ::milvus::grpc::IndexParam *index_Param);
protected: protected:
explicit explicit
CreateIndexTask(const ::milvus::grpc::IndexParam &index_Param); CreateIndexTask(const ::milvus::grpc::IndexParam *index_Param);
ServerError ServerError
OnExecute() override; OnExecute() override;
private: private:
::milvus::grpc::IndexParam index_param_; const ::milvus::grpc::IndexParam *index_param_;
}; };
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
class ShowTablesTask : public GrpcBaseTask { class ShowTablesTask : public GrpcBaseTask {
public: public:
static BaseTaskPtr static BaseTaskPtr
Create(::grpc::ServerWriter<::milvus::grpc::TableName> &writer); Create(::grpc::ServerWriter<::milvus::grpc::TableName> *writer);
protected: protected:
explicit explicit
ShowTablesTask(::grpc::ServerWriter<::milvus::grpc::TableName> &writer); ShowTablesTask(::grpc::ServerWriter<::milvus::grpc::TableName> *writer);
ServerError ServerError
OnExecute() override; OnExecute() override;
private: private:
::grpc::ServerWriter<::milvus::grpc::TableName> writer_; ::grpc::ServerWriter<::milvus::grpc::TableName> *writer_;
}; };
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
class InsertTask : public GrpcBaseTask { class InsertTask : public GrpcBaseTask {
public: public:
static BaseTaskPtr static BaseTaskPtr
Create(const ::milvus::grpc::InsertParam &insert_Param, Create(const ::milvus::grpc::InsertParam *insert_Param,
::milvus::grpc::VectorIds &record_ids_); ::milvus::grpc::VectorIds *record_ids_);
protected: protected:
InsertTask(const ::milvus::grpc::InsertParam &insert_Param, InsertTask(const ::milvus::grpc::InsertParam *insert_Param,
::milvus::grpc::VectorIds &record_ids_); ::milvus::grpc::VectorIds *record_ids_);
ServerError ServerError
OnExecute() override; OnExecute() override;
private: private:
const ::milvus::grpc::InsertParam insert_param_; const ::milvus::grpc::InsertParam *insert_param_;
::milvus::grpc::VectorIds &record_ids_; ::milvus::grpc::VectorIds *record_ids_;
}; };
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
class SearchTask : public GrpcBaseTask { class SearchTask : public GrpcBaseTask {
public: public:
static BaseTaskPtr static BaseTaskPtr
Create(const ::milvus::grpc::SearchParam &search_param, Create(const ::milvus::grpc::SearchParam *search_param,
const std::vector<std::string> &file_id_array, const std::vector<std::string> &file_id_array,
::grpc::ServerWriter<::milvus::grpc::TopKQueryResult> &writer); ::grpc::ServerWriter<::milvus::grpc::TopKQueryResult> *writer);
protected: protected:
SearchTask(const ::milvus::grpc::SearchParam &search_param, SearchTask(const ::milvus::grpc::SearchParam *search_param,
const std::vector<std::string> &file_id_array, const std::vector<std::string> &file_id_array,
::grpc::ServerWriter<::milvus::grpc::TopKQueryResult> &writer); ::grpc::ServerWriter<::milvus::grpc::TopKQueryResult> *writer);
ServerError ServerError
OnExecute() override; OnExecute() override;
private: private:
const ::milvus::grpc::SearchParam search_param_; const ::milvus::grpc::SearchParam *search_param_;
std::vector<std::string> file_id_array_; std::vector<std::string> file_id_array_;
::grpc::ServerWriter<::milvus::grpc::TopKQueryResult> writer_; ::grpc::ServerWriter<::milvus::grpc::TopKQueryResult> *writer_;
}; };
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...@@ -204,16 +204,16 @@ private: ...@@ -204,16 +204,16 @@ private:
class DeleteByRangeTask : public GrpcBaseTask { class DeleteByRangeTask : public GrpcBaseTask {
public: public:
static BaseTaskPtr static BaseTaskPtr
Create(const ::milvus::grpc::DeleteByRangeParam &delete_by_range_param); Create(const ::milvus::grpc::DeleteByRangeParam *delete_by_range_param);
protected: protected:
DeleteByRangeTask(const ::milvus::grpc::DeleteByRangeParam &delete_by_range_param); DeleteByRangeTask(const ::milvus::grpc::DeleteByRangeParam *delete_by_range_param);
ServerError ServerError
OnExecute() override; OnExecute() override;
private: private:
::milvus::grpc::DeleteByRangeParam delete_by_range_param_; const ::milvus::grpc::DeleteByRangeParam *delete_by_range_param_;
}; };
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...@@ -237,18 +237,18 @@ class DescribeIndexTask : public GrpcBaseTask { ...@@ -237,18 +237,18 @@ class DescribeIndexTask : public GrpcBaseTask {
public: public:
static BaseTaskPtr static BaseTaskPtr
Create(const std::string &table_name, Create(const std::string &table_name,
::milvus::grpc::IndexParam &index_param); ::milvus::grpc::IndexParam *index_param);
protected: protected:
DescribeIndexTask(const std::string &table_name, DescribeIndexTask(const std::string &table_name,
::milvus::grpc::IndexParam &index_param); ::milvus::grpc::IndexParam *index_param);
ServerError ServerError
OnExecute() override; OnExecute() override;
private: private:
std::string table_name_; std::string table_name_;
::milvus::grpc::IndexParam& index_param_; ::milvus::grpc::IndexParam *index_param_;
}; };
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或