Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0

Former-commit-id: a75564eb50fab3ede73101ee4803ebeebb45ed0b
This commit is contained in:
Yu Kun 2019-09-06 11:50:47 +08:00
commit c9347eb164

View File

@ -104,7 +104,7 @@ Status DBImpl::CreateTable(meta::TableSchema& table_schema) {
}
meta::TableSchema temp_schema = table_schema;
temp_schema.index_file_size_ *= ONE_MB;
temp_schema.index_file_size_ *= ONE_MB; //store as MB
return meta_ptr_->CreateTable(temp_schema);
}
@ -139,7 +139,9 @@ Status DBImpl::DescribeTable(meta::TableSchema& table_schema) {
return Status::Error("Milsvus server is shutdown!");
}
return meta_ptr_->DescribeTable(table_schema);
auto stat = meta_ptr_->DescribeTable(table_schema);
table_schema.index_file_size_ /= ONE_MB; //return as MB
return stat;
}
Status DBImpl::HasTable(const std::string& table_id, bool& has_or_not) {
@ -255,7 +257,7 @@ Status DBImpl::CreateIndex(const std::string& table_id, const TableIndex& index)
if(!utils::IsSameIndex(old_index, new_index)) {
DropIndex(table_id);
status = meta_ptr_->UpdateTableIndexParam(table_id, index);
status = meta_ptr_->UpdateTableIndexParam(table_id, new_index);
if (!status.ok()) {
ENGINE_LOG_ERROR << "Failed to update table index info for table: " << table_id;
return status;