mirrors/valkey
1
0
Fork 0
mirror of http://github.com/valkey-io/valkey synced 2024-11-22 00:52:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Skip test for sdsRemoveFreeSpace when mem_allocator is not jemalloc (#11878)

Browse Source 
Test `trim on SET with big value` (introduced from #11817) fails under mac m1 with libc mem_allocator.
The reason is that malloc(33000) will allocate 65536 bytes(>42000).
This test still passes under ubuntu with libc mem_allocator.

```
*** [err]: trim on SET with big value in tests/unit/type/string.tcl
Expected [r memory usage key] < 42000 (context: type source line 471 file /Users/iospack/data/redis_fork/tests/unit/type/string.tcl cmd {assert {[r memory usage key] < 42000}} proc ::test)
```

simple test under mac m1 with libc mem_allocator:
```c
void *p = zmalloc(33000);
printf("malloc size: %zu\n", zmalloc_size(p));

# output
malloc size: 65536
```
This commit is contained in:
sundb 2023-03-07 15:06:58 +08:00 committed by GitHub
parent 3a90ea998c
commit 3fba3ccd96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/modules/basics.c
View File

@ -417,11 +417,22 @@ int TestTrimString(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
size_t string_len = RedisModule_MallocSizeString(s);
RedisModule_TrimStringAllocation(s);
size_t len_after_trim = RedisModule_MallocSizeString(s);
if (len_after_trim < string_len) {
/* Determine if using jemalloc memory allocator. */
RedisModuleServerInfoData *info = RedisModule_GetServerInfo(ctx, "memory");
const char *field = RedisModule_ServerInfoGetFieldC(info, "mem_allocator");
int use_jemalloc = !strncmp(field, "jemalloc", 8);
/* Jemalloc will reallocate `s` from 2k to 1k after RedisModule_TrimStringAllocation(),
* but non-jemalloc memory allocators may keep the old size. */
if ((use_jemalloc && len_after_trim < string_len) ||
(!use_jemalloc && len_after_trim <= string_len))
{
RedisModule_ReplyWithSimpleString(ctx, "OK");
} else {
RedisModule_ReplyWithError(ctx, "String was not trimmed as expected.");
}
RedisModule_FreeServerInfo(ctx, info);
RedisModule_Free(tmp);
RedisModule_FreeString(ctx,s);
return REDISMODULE_OK;

2
tests/unit/moduleapi/misc.tcl
View File

@ -525,6 +525,7 @@ start_server {tags {"modules"}} {
assert_equal {0} [r test.get_n_events]
}
if {[string match {*jemalloc*} [s mem_allocator]]} {
test {test RM_Call with large arg for SET command} {
# set a big value to trigger increasing the query buf
r set foo [string repeat A 100000]
@ -533,6 +534,7 @@ start_server {tags {"modules"}} {
# asset the value was trimmed
assert {[r memory usage bar] < 42000}; # 42K to count for Jemalloc's additional memory overhead.
}
} ;# if jemalloc
test "Unload the module - misc" {
assert_equal {OK} [r module unload misc]

2
tests/unit/type/string.tcl
View File

@ -460,6 +460,7 @@ start_server {tags {"string"}} {
}
}
if {[string match {*jemalloc*} [s mem_allocator]]} {
test {trim on SET with big value} {
# set a big value to trigger increasing the query buf
r set key [string repeat A 100000]
@ -468,6 +469,7 @@ start_server {tags {"string"}} {
# asset the value was trimmed
assert {[r memory usage key] < 42000}; # 42K to count for Jemalloc's additional memory overhead.
}
} ;# if jemalloc
test {Extended SET can detect syntax errors} {
set e {}