xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: alpine compile error for 3.0 (#20064) 

* fix: alpine support

* fix: ostimer thread_id

* fix: taosPrintTrace and tsStreamMax

* fix: make_install.sh and dnodes.py for alpine

* fix: cmake.platform and cut option for alpine

* fix: timer sigev and string convert

* fix: test case for alpine

* fix: fix test script for alpine

---------

Co-authored-by: t_max <1172915550@qq.com>
This commit is contained in:
Shuduo Sang 2023-02-20 22:31:56 +08:00 committed by GitHub
parent e8dc7c8f37
commit 48426ed2df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/os/src/osMemory.c
View File

@ -229,27 +229,27 @@ void taosPrintBackTrace() { return; }
#endif #endif
int32_t taosMemoryDbgInit() { int32_t taosMemoryDbgInit() {
#if defined(LINUX) #if defined(LINUX) && !defined(_ALPINE)
int ret = mallopt(M_MMAP_THRESHOLD, 0); int ret = mallopt(M_MMAP_THRESHOLD, 0);
if (0 == ret) { if (0 == ret) {
return TAOS_SYSTEM_ERROR(errno); return TAOS_SYSTEM_ERROR(errno);
} }
return 0; return 0;
#else #else
return TSDB_CODE_FAILED; return TSDB_CODE_FAILED;
#endif #endif
} }
int32_t taosMemoryDbgInitRestore() { int32_t taosMemoryDbgInitRestore() {
#if defined(LINUX) #if defined(LINUX) && !defined(_ALPINE)
int ret = mallopt(M_MMAP_THRESHOLD, 128 * 1024); int ret = mallopt(M_MMAP_THRESHOLD, 128 * 1024);
if (0 == ret) { if (0 == ret) {
return TAOS_SYSTEM_ERROR(errno); return TAOS_SYSTEM_ERROR(errno);
} }
return 0; return 0;
#else #else
return TSDB_CODE_FAILED; return TSDB_CODE_FAILED;
#endif #endif
} }

2
tests/requirements.txt
View File

@ -7,4 +7,4 @@ toml
distro distro
requests requests
pexpect pexpect
faker faker

4
tests/script/tsim/stream/ignoreExpiredData.sim
View File

@ -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 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(1648791211000,1,2,3);
sql insert into ts1 values(1648791222001,2,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(1648791211000,1,2,3);
sql insert into ts2 values(1648791222001,2,2,3); sql insert into ts2 values(1648791222001,2,2,3);
@ -160,4 +160,4 @@ if $data02 != 1 then
goto loop5 goto loop5
endi endi
system sh/stop_dnodes.sh system sh/stop_dnodes.sh