Commit e532bd39 authored by peng.xu's avatar peng.xu
Browse files

Merge branch 'branch-0.5.0' into 'branch-0.5.0' 

MS-620 Get table row counts display wrong error code

See merge request megasearch/milvus!680

Former-commit-id: 03ed0f5d6fb8d0904322898d4b85721db87597ba
parents 96b114ee a04548ba

cpp/CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-599 - search wrong result when table created with metric_type: IP

- MS-601 - Docker logs error caused by get CPUTemperature error

- MS-622 - Delete vectors should be failed if date range is invalid

- MS-620 - Get table row counts display wrong error code



## Improvement

- MS-552 - Add and change the easylogging library

cpp/src/server/grpc_impl/GrpcRequestTask.cpp

+5 −1
Original line number Diff line number Diff line
@@ -706,8 +706,12 @@ CountTableTask::OnExecute() { 
        uint64_t row_count = 0;

        status = DBWrapper::DB()->GetTableRowCount(table_name_, row_count);

        if (!status.ok()) {

            if (status.code(), DB_NOT_FOUND) {

                return Status(SERVER_TABLE_NOT_EXIST, "Table " + table_name_ + " not exists");

            } else {

                return status;

            }

        }



        row_count_ = static_cast<int64_t>(row_count);