diff --git a/source/os/src/osMemory.c b/source/os/src/osMemory.c index 242c3d32bf..c641d893a1 100644 --- a/source/os/src/osMemory.c +++ b/source/os/src/osMemory.c @@ -229,27 +229,27 @@ void taosPrintBackTrace() { return; } #endif int32_t taosMemoryDbgInit() { -#if defined(LINUX) +#if defined(LINUX) && !defined(_ALPINE) int ret = mallopt(M_MMAP_THRESHOLD, 0); if (0 == ret) { return TAOS_SYSTEM_ERROR(errno); - } + } return 0; -#else +#else return TSDB_CODE_FAILED; #endif } int32_t taosMemoryDbgInitRestore() { -#if defined(LINUX) +#if defined(LINUX) && !defined(_ALPINE) int ret = mallopt(M_MMAP_THRESHOLD, 128 * 1024); if (0 == ret) { return TAOS_SYSTEM_ERROR(errno); - } + } return 0; -#else +#else return TSDB_CODE_FAILED; #endif } diff --git a/tests/requirements.txt b/tests/requirements.txt index d2edbfb32d..c6e27fd3be 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -7,4 +7,4 @@ toml distro requests pexpect -faker \ No newline at end of file +faker diff --git a/tests/script/tsim/stream/ignoreExpiredData.sim b/tests/script/tsim/stream/ignoreExpiredData.sim index b143b7977f..fb6cf2eec6 100644 --- a/tests/script/tsim/stream/ignoreExpiredData.sim +++ b/tests/script/tsim/stream/ignoreExpiredData.sim @@ -116,7 +116,7 @@ sql create stream stream_t1 trigger at_once IGNORE EXPIRED 1 into streamtST1 as sql create stream stream_t2 trigger at_once IGNORE EXPIRED 1 into streamtST2 as select _wstart, count(*) c1, count(a) c2 , sum(a) c3 , max(b) c5, min(c) c6 from st session(ts, 10s) ; sql insert into ts1 values(1648791211000,1,2,3); sql insert into ts1 values(1648791222001,2,2,3); -sleep 300 +sleep 200 sql insert into ts2 values(1648791211000,1,2,3); sql insert into ts2 values(1648791222001,2,2,3); @@ -160,4 +160,4 @@ if $data02 != 1 then goto loop5 endi -system sh/stop_dnodes.sh \ No newline at end of file +system sh/stop_dnodes.sh