milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enhance: enable assert method to format arguments (#28812) 

for now the assert method in segcore could accept a string information,
too many codes don't print the value they assert.

make it happy
related #28811

---------

Signed-off-by: yah01 <yah2er0ne@outlook.com>
pull/28909/head
yah01 2023-12-01 18:04:33 +08:00 committed by GitHub
parent 24c565e37b
commit 342635ed61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 69 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/core/src/common/Array.h
View File

@ -234,10 +234,10 @@ class Array {
template <typename T>
T
get_data(const int index) const {
AssertInfo(
index >= 0 && index < length_,
fmt::format(
"index out of range, index={}, length={}", index, length_));
AssertInfo(index >= 0 && index < length_,
"index out of range, index={}, length={}",
index,
length_);
if constexpr (std::is_same_v<T, std::string> ||
std::is_same_v<T, std::string_view>) {
size_t element_length = (index == length_ - 1)
@ -461,10 +461,10 @@ class ArrayView {
template <typename T>
T
get_data(const int index) const {
AssertInfo(
index >= 0 && index < length_,
fmt::format(
"index out of range, index={}, length={}", index, length_));
AssertInfo(index >= 0 && index < length_,
"index out of range, index={}, length={}",
index,
length_);
if constexpr (std::is_same_v<T, std::string> ||
std::is_same_v<T, std::string_view>) {

12
internal/core/src/common/BitsetView.h
View File

@ -57,13 +57,13 @@ class BitsetView : public knowhere::BitsetView {
return {};
}
AssertInfo((offset & 0x7) == 0, "offset is not divisible by 8");
AssertInfo(
(offset & 0x7) == 0, "offset {} is not divisible by 8", offset);
AssertInfo(offset + size <= this->size(),
fmt::format(
"index out of range, offset={}, size={}, bitset.size={}",
offset,
size,
this->size()));
"index out of range, offset={}, size={}, bitset.size={}",
offset,
size,
this->size());
return {data() + (offset >> 3), size};
}
};

35
internal/core/src/common/EasyAssert.h
View File

@ -24,6 +24,8 @@
#include "pb/common.pb.h"
#include "common/type_c.h"
#include "fmt/core.h"
/* Paste this on the file if you want to debug. */
namespace milvus {
enum ErrorCode {
@ -116,21 +118,28 @@ FailureCStatus(std::exception* ex) {
} // namespace milvus
#define AssertInfo(expr, info) \
do { \
auto _expr_res = bool(expr); \
/* call func only when needed */ \
if (!_expr_res) { \
milvus::impl::EasyAssertInfo( \
_expr_res, #expr, __FILE__, __LINE__, (info)); \
} \
#define AssertInfo(expr, info, args...) \
do { \
auto _expr_res = bool(expr); \
/* call func only when needed */ \
if (!_expr_res) { \
milvus::impl::EasyAssertInfo(_expr_res, \
#expr, \
__FILE__, \
__LINE__, \
fmt::format(info, ##args)); \
} \
} while (0)
#define Assert(expr) AssertInfo((expr), "")
#define PanicInfo(errcode, info) \
do { \
milvus::impl::EasyAssertInfo( \
false, "", __FILE__, __LINE__, (info), errcode); \
__builtin_unreachable(); \
#define PanicInfo(errcode, info, args...) \
do { \
milvus::impl::EasyAssertInfo(false, \
"", \
__FILE__, \
__LINE__, \
fmt::format(info, ##args), \
errcode); \
__builtin_unreachable(); \
} while (0)

2
internal/core/src/common/FieldMeta.h
View File

@ -45,7 +45,7 @@ datatype_sizeof(DataType data_type, int dim = 1) {
case DataType::VECTOR_FLOAT:
return sizeof(float) * dim;
case DataType::VECTOR_BINARY: {
AssertInfo(dim % 8 == 0, "dim=" + std::to_string(dim));
AssertInfo(dim % 8 == 0, "dim={}", dim);
return dim / 8;
}
case DataType::VECTOR_FLOAT16: {

6
internal/core/src/common/File.h
View File

@ -35,9 +35,9 @@ class File {
Open(const std::string_view filepath, int flags) {
int fd = open(filepath.data(), flags, S_IRUSR | S_IWUSR);
AssertInfo(fd != -1,
fmt::format("failed to create mmap file {}: {}",
filepath,
strerror(errno)));
"failed to create mmap file {}: {}",
filepath,
strerror(errno));
return File(fd);
}

22
internal/core/src/common/Json.h
View File

@ -48,11 +48,11 @@ class Json {
}
Json(const char* data, size_t len, size_t cap) : data_(data, len) {
AssertInfo(len + simdjson::SIMDJSON_PADDING <= cap,
fmt::format("create json without enough memory size for "
"SIMD, len={}, cap={}",
len,
cap));
AssertInfo(
len + simdjson::SIMDJSON_PADDING <= cap,
"create json without enough memory size for SIMD, len={}, cap={}",
len,
cap);
}
// WARN: this is used for fast non-copy construction,
@ -105,9 +105,9 @@ class Json {
auto doc =
parser.iterate(data_, data_.size() + simdjson::SIMDJSON_PADDING);
AssertInfo(doc.error() == simdjson::SUCCESS,
fmt::format("failed to parse the json {}: {}",
data_,
simdjson::error_message(doc.error())));
"failed to parse the json {}: {}",
data_,
simdjson::error_message(doc.error()));
return doc;
}
@ -119,9 +119,9 @@ class Json {
// as we have allocated the memory with this padding
auto doc = parser.parse(data_);
AssertInfo(doc.error() == simdjson::SUCCESS,
fmt::format("failed to parse the json {}: {}",
data_,
simdjson::error_message(doc.error())));
"failed to parse the json {}: {}",
data_,
simdjson::error_message(doc.error()));
return doc;
}

3
internal/core/src/common/QueryResult.h
View File

@ -39,7 +39,8 @@ struct SearchResult {
return 0;
}
AssertInfo(topk_per_nq_prefix_sum_.size() == total_nq_ + 1,
"wrong topk_per_nq_prefix_sum_ size");
"wrong topk_per_nq_prefix_sum_ size {}",
topk_per_nq_prefix_sum_.size());
return topk_per_nq_prefix_sum_[total_nq_];
}

4
internal/core/src/common/protobuf_utils.h
View File

@ -32,8 +32,8 @@ RepeatedKeyValToMap(
kvs) {
std::map<string, string> mapping;
for (auto& kv : kvs) {
AssertInfo(!mapping.count(kv.key()),
"repeat key(" + kv.key() + ") in protobuf");
AssertInfo(
!mapping.count(kv.key()), "repeat key({}) in protobuf", kv.key());
mapping.emplace(kv.key(), kv.value());
}
return mapping;

29
internal/core/src/mmap/Column.h
View File

@ -57,9 +57,9 @@ class ColumnBase {
MAP_PRIVATE | MAP_ANON,
-1,
0));
AssertInfo(
data_ != MAP_FAILED,
fmt::format("failed to create anon map, err: {}", strerror(errno)));
AssertInfo(data_ != MAP_FAILED,
"failed to create anon map, err: {}",
strerror(errno));
}
// mmap mode ctor
@ -79,8 +79,8 @@ class ColumnBase {
file.Descriptor(),
0));
AssertInfo(data_ != MAP_FAILED,
fmt::format("failed to create file-backed map, err: {}",
strerror(errno)));
"failed to create file-backed map, err: {}",
strerror(errno));
madvise(data_, cap_size_ + padding_, MADV_WILLNEED);
}
@ -102,16 +102,16 @@ class ColumnBase {
file.Descriptor(),
0));
AssertInfo(data_ != MAP_FAILED,
fmt::format("failed to create file-backed map, err: {}",
strerror(errno)));
"failed to create file-backed map, err: {}",
strerror(errno));
}
virtual ~ColumnBase() {
if (data_ != nullptr) {
if (munmap(data_, cap_size_ + padding_)) {
AssertInfo(true,
fmt::format("failed to unmap variable field, err={}",
strerror(errno)));
"failed to unmap variable field, err={}",
strerror(errno));
}
}
}
@ -193,16 +193,15 @@ class ColumnBase {
-1,
0));
AssertInfo(data != MAP_FAILED,
fmt::format("failed to create map: {}", strerror(errno)));
AssertInfo(
data != MAP_FAILED, "failed to create map: {}", strerror(errno));
if (data_ != nullptr) {
std::memcpy(data, data_, size_);
if (munmap(data_, cap_size_ + padding_)) {
AssertInfo(
false,
fmt::format("failed to unmap while expanding, err={}",
strerror(errno)));
AssertInfo(false,
"failed to unmap while expanding, err={}",
strerror(errno));
}
}