xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
56,917 Commits 3 Branches 0 Tags 479 MiB
Commit Graph

509 Commits

Author SHA1 Message Date
Xiaoyu Wang d6dd087f84 merge main 2023-02-25 10:29:20 +08:00
Hui Li 965d91572a
Merge pull request #20148 from taosdata/fix/3_coverity 
fix(query): fix syntax errors on centos.
 2023-02-24 17:39:12 +08:00
xinsheng Ren e3f21ae98f
fix: TD-22674 coverity scan (#20126) 
* fix: TD-22674 coverity scan

* fix: compile error

---------

Co-authored-by: facetosea <25808407@qq.com>
 2023-02-24 15:17:14 +08:00
Haojun Liao a217b3e457 fix(query): fix syntax errors on centos. 2023-02-24 13:37:35 +08:00
Haojun Liao 02e298b973 fix(query): fix syntax errors on centos. 2023-02-24 11:52:30 +08:00
Haojun Liao 8eb1e56e8d fix(query): fix syntax errors on centos. 2023-02-24 11:42:08 +08:00
Haojun Liao 22aa03307c fix(query): fix syntax errors on centos. 2023-02-24 11:38:54 +08:00
Xiaoyu Wang 7337f5ff7d
Merge pull request #20052 from taosdata/fix/3.0_merge_main 
merge main
 2023-02-21 16:27:19 +08:00
Shuduo Sang 48426ed2df
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>
 2023-02-20 22:31:56 +08:00
wangmm0220 6052018e77 fix:dispatch_semaphore_wait use error 2023-02-20 16:42:25 +08:00
Xiaoyu Wang c597de099f merge main 2023-02-20 13:41:27 +08:00
dapan1121 1128b1222b feat: add memory debug option 2023-02-17 17:40:14 +08:00
yihaoDeng 1aee609d36 fix: change socket opt 2023-02-13 16:46:42 +08:00
xinsheng Ren 6122a2fb0c
fix stackflow on mac (#19592) 
* fix stackflow on mac

* ALL UPPER CASE for macro definition

---------

Co-authored-by: facetosea <25808407@qq.com>
 2023-02-10 18:31:09 +08:00
Xiaoyu Wang 3382a24a69 merge main 2023-02-10 18:03:11 +08:00
Shuduo Sang ea5d925c50
fix: alpine support (#19353) 
* 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

* fix: fix test script for alpine

* fix: fix taosLogTrace for Alpine

* fix: fix taosSort

* fix: vnode and mnode compare functions and test cases

* fix: sorting algorithms and unit tests

* fix: libtaosws.so build error on Alpine

* fix: libtaosws.so build error on Alpine

---------

Co-authored-by: t_max <1172915550@qq.com>
 2023-02-10 13:00:55 +08:00
Xiaoyu Wang 09925437e3 merge main 2023-02-08 09:51:52 +08:00
Ganlin Zhao 3b03341de4 fix: setting logKeepDays to -1 result in old log files not compressed and 
empty.
 2023-02-07 18:15:55 +08:00
dapan1121 c4295e1b29
Merge pull request #19779 from taosdata/fix/hostShutDown 
fix: no resp when host machine shutdown
 2023-02-06 16:20:39 +08:00
yihaoDeng 121afc6047 rm invalid param on macos 2023-02-06 10:23:25 +08:00
freemine a999e56a1d typo: pthread_cleanup_push/pop better exist in pair 2023-02-05 16:08:34 +08:00
yihaoDeng e7a72d5a28 fix: no resp when host machine shutdown 2023-02-03 13:57:26 +08:00
dapan1121 ca16ebc6e7 fix: add get ip addr result validation 2023-02-03 10:36:47 +08:00
Xiaoyu Wang 677a27a097
Merge pull request #19690 from taosdata/fix/3.0_merge_main 
Fix/3.0_merge_main
 2023-01-31 09:20:29 +08:00
xinsheng Ren 3d2b5ea6b6
Fix/xsren/td 20179/win version info (#19708) 
* fix:get system info on windows

* fix:head file

* fix:del tchar.h
 2023-01-31 00:49:18 +08:00
Hongze Cheng 0f00862d8b Merge branch 'fix/TD-22070' of https://github.com/taosdata/TDengine into fix/3.0_merge_main 2023-01-30 10:17:59 +08:00
Haojun Liao 4892740cb1 fix(query): fix error on windows. 2023-01-29 14:00:00 +08:00
Haojun Liao 995b75f77f fix(query): fix syntax error on windows. 2023-01-29 13:44:30 +08:00
Haojun Liao ef8b68bc80 fix(query): fix syntax error on windows. 2023-01-29 13:31:43 +08:00
Haojun Liao 8d2633cd99 fix(query): add qsort for alpine. 2023-01-29 09:47:28 +08:00
Haojun Liao 555ee2b556 fix(query): add qsort for alpine. 2023-01-29 09:43:03 +08:00
Xiaoyu Wang 24157e78d6 merge main 2023-01-28 17:52:58 +08:00
xinsheng Ren 1a5adfc547
fix:getTimeOfDay on windows (#19680) 2023-01-28 17:29:38 +08:00
xinsheng Ren 3d1adcfe3d
fix:getTimeOfDay on windows (#19674) 2023-01-28 13:25:52 +08:00
xinsheng Ren 5c5e9144f2
ALL UPPER CASE for macro definition (#19605) 
Co-authored-by: facetosea <25808407@qq.com>
 2023-01-18 10:08:44 +08:00
xinsheng Ren 172559a2af
fix stackflow on mac (#19590) 
Co-authored-by: facetosea <25808407@qq.com>
 2023-01-17 15:21:02 +08:00
freemine e92bf83986
bugfix: stack-buffer-overflow (#19584) 2023-01-17 15:05:33 +08:00
Shengliang Guan d90eef6656 Merge branch '3.0' into merge/mainto3.0_0108 2023-01-08 09:54:21 +08:00
Shengliang Guan a3b5fca070
Merge pull request #19409 from taosdata/FIX/xsren/osFileUnlock 
fix:Deadlock caused by assert modification
 2023-01-08 09:42:20 +08:00
facetosea 61734b9c6a fix:Deadlock caused by assert modification 2023-01-06 10:43:47 +08:00
Shuduo Sang bcbf672600 Merge branch '3.0' into chore/sangshuduo/TD-19391-oem-support 2023-01-05 18:16:38 +08:00
Shuduo Sang c6a08b64b5 chore: merge with 3.0 2023-01-05 17:36:30 +08:00
Minglei Jin 4e1f5b2979 fix(meta): cleanup coverity scan issues 2023-01-05 14:04:21 +08:00
xinsheng Ren 936f282eab
TD-21220 fix assert (#19363) 
* TD-21220 fix assert

* fix/compile failed

* fix/taosEOFFile exception return

Co-authored-by: facetosea <25808407@qq.com>
 2023-01-05 09:20:14 +08:00
dapan1121 be23890976 fix: ut test issue 2023-01-04 16:07:30 +08:00
Xiaoyu Wang fdde287ca9 merge main 2023-01-04 11:43:20 +08:00
xinsheng Ren 047aae9caf
Enh/xsren/td 21652/win file lock base main (#19317) 
* add os subtest (#19304)

* add os subtest

* fix/test.cpp include header file

Co-authored-by: facetosea <25808407@qq.com>

* TD-21652 win file lock

* fix/ostest:exception on mac

Co-authored-by: facetosea <25808407@qq.com>
 2023-01-04 08:59:29 +08:00
Shengliang Guan 650ea06b69
Merge pull request #19321 from taosdata/feature/3_liaohj 
fix(utility): fix the bug in creating auto delete files.
 2023-01-03 17:40:48 +08:00
xinsheng Ren 42c662bf17
Enh/xsren/td 21652/win file lock (#19313) 
* add os subtest

* fix/test.cpp include header file

* TD-21652 win file lock

* fix/ostest:exception on mac

Co-authored-by: facetosea <25808407@qq.com>
 2023-01-03 15:24:51 +08:00
Haojun Liao f93abddc88 fix(utility): fix the bug in creating auto delete files. 2023-01-03 11:16:49 +08:00
xinsheng Ren 25f24af05d
add os subtest (#19304) 
* add os subtest

* fix/test.cpp include header file

Co-authored-by: facetosea <25808407@qq.com>
 2023-01-03 10:19:32 +08:00
xinsheng Ren e93863a652
enh/TD-21425/windows print trace (#19258) 
* enh/TD-21425/windows print trace

* enh/windows trace test

* fix/check calloc failed

* enh/windows print,stack size hard code
 2022-12-30 15:39:39 +08:00
xinsheng Ren fcf64fa3d5
Enh/xsren/win print trace mainbase (#19279) 
* enh/TD-21425/windows print trace

* enh/windows trace test

* fix/check calloc failed

* enh/windows print,stack size hard code
 2022-12-30 15:39:15 +08:00
Shuduo Sang 868cf83cdb chore: prepare for string passing 2022-12-29 19:20:46 +08:00
xinsheng Ren 1876d6d748 Fix/xsren/td 20817 mac fqdn (#19078) 
* fix/TD-20817-mac-fqdn use localhostname

* fix/TD-20817-mac-fqdn redundant codes

* fix/TD-20817-mac-fqdn,replace command with api

Co-authored-by: facetosea <25808407@qq.com>
Co-authored-by: Shuduo Sang <sangshuduo@gmail.com>
 2022-12-29 09:38:48 +08:00
xinsheng Ren 8c35b856c6 fix/TS-2297/windows sort use stdlib (#19152) 
Co-authored-by: facetosea <25808407@qq.com>
 2022-12-29 09:38:16 +08:00
xinsheng Ren 853b93fbe1
Fix/xsren/td 20817 mac fqdn (#19078) 
* fix/TD-20817-mac-fqdn use localhostname

* fix/TD-20817-mac-fqdn redundant codes

* fix/TD-20817-mac-fqdn,replace command with api

Co-authored-by: facetosea <25808407@qq.com>
Co-authored-by: Shuduo Sang <sangshuduo@gmail.com>
 2022-12-29 09:21:20 +08:00
xinsheng Ren 1af1cf0618
fix/TS-2297/windows sort use stdlib (#19152) 
Co-authored-by: facetosea <25808407@qq.com>
 2022-12-26 18:38:01 +08:00
Shengliang Guan 664dcb6b4e Merge branch 'main' into merge/mainto3.0_1226 2022-12-26 09:26:54 +08:00
yihaoDeng 71bbc4fdd0 update charset conv 2022-12-23 22:21:28 +08:00
Xiaoyu Wang d3cb2a3a0a merge main 2022-12-18 20:36:06 +08:00
Shengliang Guan 12088812dd fix: should not fsync in log level is error 2022-12-16 15:54:19 +08:00
Shengliang Guan 04750d9078
Merge pull request #18905 from taosdata/feature/3_liaohj 
refactor: do multiple refactor and improve some query perf.
 2022-12-14 08:01:42 +08:00
xinsheng Ren b03e3a8134
FIX:TS-2258-mac cpuinfo has an extra enter character (#18916) 
* FIX:TS-2258-mac cpuinfo has an extra enter character

* fix:TS-2258_static_check

Co-authored-by: facetosea <25808407@qq.com>
 2022-12-13 10:57:48 +08:00
Haojun Liao 8f02297890 refactor: do some internal refactor. 2022-12-12 17:53:04 +08:00
dapan1121 4efa7c2b47
Merge pull request #18815 from taosdata/enh/insertOptimize 
enh: insert multi tables optimize
 2022-12-09 12:22:59 +08:00
Shengliang Guan 610ae057af
Merge pull request #18807 from taosdata/FIX/xsren/TD-20141-macOS_OS_type_empty 
Fix/xsren/td 20141 mac os os type empty
 2022-12-08 21:13:29 +08:00
Xiaoyu Wang a202b29853 fix: compile warn 2022-12-08 17:37:35 +08:00
facetosea fcfff59f86 fix:maxOS type 2022-12-08 11:13:57 +08:00
facetosea 4aaa29bd4f fix:TD-20141 mac os type empty 2022-12-08 10:50:35 +08:00
Shengliang Guan 1d34b7edf8 enh: print dnode startup parameters 2022-12-08 10:50:24 +08:00
Shengliang Guan 7553cd6e65 fix: compile errors 2022-12-07 22:28:12 +08:00
Shengliang Guan 1bb1025f7d enh: add tassert 2022-12-07 22:24:47 +08:00
Shengliang Guan 6d94afe48f
Revert "refact: adjust some assert cases" 2022-12-07 21:51:17 +08:00
Shengliang Guan 6ef608f7af fix: complie error 2022-12-07 19:02:43 +08:00
Shengliang Guan d5126d469a refact: replcase ASSERT with tAssert 2022-12-07 18:42:48 +08:00
Shengliang Guan f69a188f7e refact: replcase ASSERT with tAssert 2022-12-07 18:37:40 +08:00
yihaoDeng 9ce9d21507 support fail fast 2022-12-06 10:30:14 +08:00
Hongze Cheng d977929c99 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/async_commit 2022-12-04 09:37:29 +08:00
Haojun Liao fa43f86fe1 refactor: add an assert. 2022-12-03 12:43:03 +08:00
Haojun Liao 85c1e3aabf refactor: add an assert. 2022-12-03 12:41:56 +08:00
Haojun Liao b6199d8d99 enh(query): update the aligned bits for colInfodata 2022-12-03 12:37:42 +08:00
Minglei Jin 6cb65f336d Merge branch 'v3.0' into feat/async_commit 2022-12-02 14:49:58 +08:00
Shengliang Guan 8efb45ffbf
Merge pull request #18613 from taosdata/FIX/xsren/TD-20738-timewait 
fix:window time wait
 2022-12-02 08:01:52 +08:00
facetosea c0c1e0dadd fix:compile error 2022-12-01 19:25:49 +08:00
Hongze Cheng 3fc30c991e Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/async_commit 2022-12-01 18:59:21 +08:00
Shengliang Guan fd31980b91
Merge pull request #18535 from taosdata/enh/addTraceInfo 
enh: add trace info
 2022-11-30 17:23:20 +08:00
facetosea a450fae89a fix:window time wait 2022-11-30 17:00:36 +08:00
Hongze Cheng df7c07a541 Merge branch 'fix/tdb-async-commit' of https://github.com/taosdata/TDengine into feat/async_commit 2022-11-30 16:48:09 +08:00
Shengliang Guan 6bfcc2e4c3
Merge pull request #18556 from taosdata/FIX/xsren/TS-2157-winGetTime 
fix:concurrency conflicts occur when obtaining windows system time
 2022-11-30 14:23:41 +08:00
Shuduo Sang 5a0b642234 Merge branch '3.0' into FIX/xsren/TS-2157-winGetTime 2022-11-30 13:15:06 +08:00
Liu Jicong 89119c6247 Merge branch '3.0' into feature/stream 2022-11-30 09:50:22 +08:00
Shuduo Sang f565ff3769
fix: get cpuid on x86 only (#18552) 
* chore: taostools sanitizer flag align with tdengine

* chore: re-enable old style build asan config for taos-tools

* chore: update taos-tools 274d230

* chore: update taos-tools and add x86 definition

* fix: get cpu id on x86 only
 2022-11-29 23:42:20 +08:00
Liu Jicong 548684e5ac fix(stream): delete multiple row 2022-11-29 23:39:58 +08:00
facetosea 81e6a9d906 fix:concurrency conflicts occur when obtaining windows system time 2022-11-29 21:41:07 +08:00
yihaoDeng 5425d67c9a add timestamp to msg head 2022-11-29 11:40:58 +08:00
Minglei Jin 7a7d7f7d00 tdb/write: new tdbPWriteFile api for commit and prep async to maindb 2022-11-28 17:31:11 +08:00
Shengliang Guan e6aed5195d
Merge pull request #18468 from taosdata/feature/3_liaohj 
refactor: improve the perf in query
 2022-11-27 23:10:00 +08:00
Shengliang Guan 58a0ea253e
Revert "enh: add debug info" 2022-11-27 00:44:12 +08:00
Shengliang Guan 7102f62872
Merge pull request #18461 from taosdata/fix/coverity_alex 
coverity problem fixed
 2022-11-26 21:44:20 +08:00