ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-08-19 19:39:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: rework MDBX_val.

Browse Source
This commit is contained in:
Leo Yuriev
2017-05-23 21:05:54 +03:00
parent ac8e987346
commit 8c18622592
10 changed files with 525 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/keygen.cc
View File

@@ -193,8 +193,8 @@ void __hot maker::mk(const serial_t serial, const essentials &params,
assert(params.maxlen >= params.minlen);
assert(params.maxlen >= length(serial));
out.value.mv_data = out.bytes;
out.value.mv_size = params.minlen;
out.value.iov_base = out.bytes;
out.value.iov_len = params.minlen;
if (params.flags & (MDB_INTEGERKEY | MDB_INTEGERDUP)) {
assert(params.maxlen == params.minlen);
@@ -204,29 +204,29 @@ void __hot maker::mk(const serial_t serial, const essentials &params,
else
out.u32 = (uint32_t)serial;
} else if (params.flags & (MDB_REVERSEKEY | MDB_REVERSEDUP)) {
if (out.value.mv_size > 8) {
memset(out.bytes, '\0', out.value.mv_size - 8);
unaligned::store(out.bytes + out.value.mv_size - 8, htobe64(serial));
if (out.value.iov_len > 8) {
memset(out.bytes, '\0', out.value.iov_len - 8);
unaligned::store(out.bytes + out.value.iov_len - 8, htobe64(serial));
} else {
out.u64 = htobe64(serial);
if (out.value.mv_size < 8) {
out.value.mv_size = std::max(length(serial), out.value.mv_size);
out.value.mv_data = out.bytes + 8 - out.value.mv_size;
if (out.value.iov_len < 8) {
out.value.iov_len = std::max(length(serial), out.value.iov_len);
out.value.iov_base = out.bytes + 8 - out.value.iov_len;
}
}
} else {
out.u64 = htole64(serial);
if (out.value.mv_size > 8)
memset(out.bytes + 8, '\0', out.value.mv_size - 8);
if (out.value.iov_len > 8)
memset(out.bytes + 8, '\0', out.value.iov_len - 8);
else
out.value.mv_size = std::max(length(serial), out.value.mv_size);
out.value.iov_len = std::max(length(serial), out.value.iov_len);
}
assert(out.value.mv_size >= params.minlen);
assert(out.value.mv_size <= params.maxlen);
assert(out.value.mv_size >= length(serial));
assert(out.value.mv_data >= out.bytes);
assert((uint8_t *)out.value.mv_data + out.value.mv_size <=
assert(out.value.iov_len >= params.minlen);
assert(out.value.iov_len <= params.maxlen);
assert(out.value.iov_len >= length(serial));
assert(out.value.iov_base >= out.bytes);
assert((uint8_t *)out.value.iov_base + out.value.iov_len <=
out.bytes + out.limit);
}

2
test/keygen.h
View File

@@ -78,7 +78,7 @@ enum {
};
struct result {
MDB_val value;
MDBX_val value;
size_t limit;
union {
uint8_t bytes[sizeof(uint64_t)];