admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-01 16:35:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source 
Former-commit-id: eb53fcbf6029d7c061d5c87835700b14a1213e63
This commit is contained in:
zhiru 2019-07-03 17:24:36 +08:00
parent 0b003144a5
commit fd6d77d627
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpp/src/db/DBImpl.cpp
View File

@ -191,6 +191,10 @@ Status DBImpl::Query(const std::string& table_id, const std::vector<std::string>
return status;
}
for (auto& file_schema : files_array) {
ENGINE_LOG_DEBUG << "file_id: " << file_schema.file_id_;
}
if(files_array.empty()) {
return Status::Error("Invalid file id");
}

10
cpp/src/db/MySQLMetaImpl.cpp
View File

@ -1083,10 +1083,10 @@ namespace meta {
// }
Query getTableFileQuery = connectionPtr->query();
getTableFileQuery << "SELECT engine_type, file_id, file_type, size, date " <<
"FROM TableFiles " <<
"WHERE table_id = " << quote << table_id << " AND " <<
"(" << idStr << ");";
getTableFileQuery << "SELECT id, engine_type, file_id, file_type, size, date " <<
"FROM TableFiles " <<
"WHERE table_id = " << quote << table_id << " AND " <<
"(" << idStr << ");";
ENGINE_LOG_DEBUG << "MySQLMetaImpl::GetTableFiles: " << getTableFileQuery.str();
@ -1106,6 +1106,8 @@ namespace meta {
TableFileSchema file_schema;
file_schema.id_ = resRow["id"];
file_schema.table_id_ = table_id;
file_schema.engine_type_ = resRow["engine_type"];

2
cpp/src/server/RequestHandler.cpp
View File

@ -53,6 +53,7 @@ RequestHandler::SearchVector(std::vector<thrift::TopKQueryResult> &_return,
const std::vector<thrift::RowRecord> &query_record_array,
const std::vector<thrift::Range> &query_range_array,
const int64_t topk) {
// SERVER_LOG_DEBUG << "Entering RequestHandler::SearchVector";
BaseTaskPtr task_ptr = SearchVectorTask::Create(table_name, std::vector<std::string>(), query_record_array,
query_range_array, topk, _return);
RequestScheduler::ExecTask(task_ptr);
@ -65,6 +66,7 @@ RequestHandler::SearchVectorInFiles(std::vector<::milvus::thrift::TopKQueryResul
const std::vector<::milvus::thrift::RowRecord> &query_record_array,
const std::vector<::milvus::thrift::Range> &query_range_array,
const int64_t topk) {
// SERVER_LOG_DEBUG << "Entering RequestHandler::SearchVectorInFiles. file_id_array size = " << std::to_string(file_id_array.size());
BaseTaskPtr task_ptr = SearchVectorTask::Create(table_name, file_id_array, query_record_array,
query_range_array, topk, _return);
RequestScheduler::ExecTask(task_ptr);

5
cpp/src/server/RequestTask.cpp
View File

@ -482,11 +482,6 @@ ServerError SearchVectorTask::OnExecute() {
engine::QueryResults results;
uint64_t record_count = (uint64_t)record_array_.size();
SERVER_LOG_DEBUG << "file_id_array_: ";
for (auto& file_id : file_id_array_) {
SERVER_LOG_DEBUG << file_id;
}
if(file_id_array_.empty()) {
stat = DBWrapper::DB()->Query(table_name_, (size_t) top_k_, record_count, vec_f.data(), dates, results);
} else {