Commit Graph

20485 Commits

Author SHA1 Message Date
dapan1121 22e20462a2 Merge remote-tracking branch 'origin/3.0' into feat/TD-22341 2023-02-17 17:50:05 +08:00
dapan1121 386f184ed7 feat: disable async log 2023-02-17 17:45:44 +08:00
dapan1121 1128b1222b feat: add memory debug option 2023-02-17 17:40:14 +08:00
Xiaoyu Wang 26a0e05952
Merge pull request #20021 from taosdata/fix/TD-22376
fix: auto trim database
2023-02-17 17:26:38 +08:00
Haojun Liao 3bb5090be8
Merge pull request #20010 from taosdata/fix/TD-22426
fix:check stream
2023-02-17 15:37:28 +08:00
Hongze Cheng aefdf9160a fix: auto trim database 2023-02-17 10:38:55 +08:00
Xiaoyu Wang 9e5f8b154b fix: grammer check 2023-02-17 09:56:41 +08:00
Hongze Cheng 1640ccc4b2 fix: another error 2023-02-16 17:50:45 +08:00
Hongze Cheng 3c37ad11e6 fix: other problems 2023-02-16 15:55:59 +08:00
54liuyao 33caf8e625 fix:check stream 2023-02-16 13:48:47 +08:00
Hongze Cheng 273b3a5423 Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/TS-2504 2023-02-16 13:46:40 +08:00
54liuyao 05c9d46fac fix:wrong tag value 2023-02-16 10:22:31 +08:00
Hongze Cheng 3289f79ab2 Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/TS-2504 2023-02-15 18:00:22 +08:00
Hongze Cheng c1a3a0855b finish code 2023-02-15 17:59:54 +08:00
54liuyao 88970c88a9 fix:dispatch create sub table 2023-02-15 11:04:49 +08:00
Haojun Liao 605b5012ae
Merge pull request #19950 from taosdata/fix/TD-21899
fix:remove id in execReader & enable task case
2023-02-15 10:33:51 +08:00
Hongze Cheng b60392b670 Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/TS-2504 2023-02-14 13:36:27 +08:00
Xiaoyu Wang 031a13c945 fix: create stream check and error code wrong 2023-02-14 11:24:44 +08:00
Haojun Liao 0328013309
Merge pull request #19948 from taosdata/feature/event
fix(query): identify the data blocks from different group.
2023-02-13 17:22:04 +08:00
wangmm0220 997f41c854 fix:conflict from 3.0 2023-02-13 14:05:53 +08:00
wangmm0220 b054ef9a9f fix:conflict from 3.0 2023-02-13 14:04:36 +08:00
wangmm0220 0e630b8f81 fix:remove id in execReader & enable task case 2023-02-13 13:38:05 +08:00
Haojun Liao f26fa32340 other: add some comments. 2023-02-13 13:32:01 +08:00
Haojun Liao c96362d5fc other: merge event branch. 2023-02-13 13:28:16 +08:00
Haojun Liao 6a6c649113 fix(query): identify the data blocks from different group. 2023-02-13 13:24:59 +08:00
Hongze Cheng 454e56fd09 Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/TS-2504 2023-02-13 10:37:32 +08:00
Xiaoyu Wang 6483b92f0c
Merge pull request #19923 from taosdata/fix/3.0_merge_main
merge main
2023-02-13 09:48:45 +08:00
Hongze Cheng 10167a90cd refact code 2023-02-13 09:39:21 +08:00
Hongze Cheng cce25bbcd8 Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/TS-2504 2023-02-13 09:14:24 +08:00
Xiaoyu Wang 3382a24a69 merge main 2023-02-10 18:03:11 +08:00
Hongze Cheng 039a0d2270 fix: compile issue 2023-02-10 18:01:22 +08:00
Hongze Cheng 9694933ec8 fix: compact issue 2023-02-10 16:24:29 +08:00
Haojun Liao 440122e010
Merge pull request #19900 from taosdata/fix/nodisk
fix(query): set lastkey during check of valid ts.
2023-02-10 13:45:08 +08:00
Hongze Cheng f523a96c2d fix compact problem 2023-02-10 13:38:21 +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
Haojun Liao a93fc323c0
Merge pull request #19904 from taosdata/fix/liaohj
fix(query): add limit/offset for sys table scan operator.
2023-02-10 11:44:56 +08:00
Haojun Liao 4f4d39a16b fix(query): set correct last key. 2023-02-10 11:32:18 +08:00
Haojun Liao f214ae9801
Merge pull request #19888 from taosdata/fix/TD-22152
fix:change uid in taosx to avoiding uid same in different db
2023-02-10 11:30:47 +08:00
Haojun Liao c537c6c12f Merge branch 'main' into fix/liaohj 2023-02-10 10:24:43 +08:00
Haojun Liao 443e8e2500 fix(query): add limit/offset for sys table scan operator. 2023-02-10 10:23:41 +08:00
Haojun Liao 0fbaf4eab0 fix(query): set lastkey during check of valid ts. 2023-02-09 23:01:44 +08:00
Xiaoyu Wang e595dce463
Merge pull request #19890 from taosdata/enh/3.0_planner_optimize
fix: tsdb reader deadlock
2023-02-09 17:34:32 +08:00
Xiaoyu Wang 86d231ce50
Merge pull request #19872 from taosdata/feat/vnode_compact
feat: data compaction
2023-02-09 16:24:50 +08:00
Xiaoyu Wang e5a27765a2 fix: tsdb reader deadlock 2023-02-09 15:57:37 +08:00
Haojun Liao 96561ac3cc
Merge pull request #19887 from taosdata/feat/ly_ig_udpate
feat(stream):add ignore check update option for create stream
2023-02-09 15:32:01 +08:00
Haojun Liao 6cf363600b
Merge pull request #19785 from taosdata/fix/TD-21899
fix:auto create table & NULL NONE problem for taosx
2023-02-09 15:31:13 +08:00
Haojun Liao 7beb8cd6e2
Merge pull request #19875 from taosdata/fix/TS-2524
fix:change async to sync in schemaless
2023-02-09 15:30:26 +08:00
wangmm0220 f9e409e991 fix:change uid in taosx to avoiding uid same in different db 2023-02-09 14:28:26 +08:00
Hongze Cheng b24d3049f5 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/vnode_compact 2023-02-09 14:27:30 +08:00
Hongze Cheng 943e86c22e fix CI problem 2023-02-09 14:27:20 +08:00