Commit Graph

23677 Commits

Author SHA1 Message Date
Shengliang Guan 56e814b3be
Merge pull request #10852 from taosdata/feature/shm
fix conflicts in feature/tq
2022-03-21 10:34:26 +08:00
Shengliang Guan 0f45064d8d Merge remote-tracking branch 'origin/feature/tq' into feature/shm 2022-03-21 10:15:17 +08:00
Yihao Deng 524edc1552
Merge pull request #10849 from taosdata/feature/supportQ
Feature/support q
2022-03-20 21:05:27 +08:00
yihaoDeng fa34b6d4b1 handle except 2022-03-20 20:52:32 +08:00
yihaoDeng e8e6dc44cc handle except 2022-03-20 19:17:51 +08:00
yihaoDeng e657b37e41 handle except 2022-03-20 18:58:00 +08:00
yihaoDeng 843477e3a1 handle except 2022-03-20 18:08:33 +08:00
Shengliang Guan d417a7adb1
Merge pull request #10847 from taosdata/feature/shm
Refactor the dnode framework code to start taosd as a subprocess
2022-03-20 12:20:30 +08:00
Shengliang Guan 08c9fc40f4 shm 2022-03-20 11:59:35 +08:00
Shengliang Guan 4cb813a920 fix thread conflict 2022-03-20 10:19:14 +08:00
Shengliang Guan 3544df4112 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-20 10:19:01 +08:00
Zhiqiang Wang a1d17e371a
Merge pull request #10848 from taosdata/fix/ZhiqiangWang/TD-13759-redefine-thread-api
[TD-13759]<fix>: redefine thread api.
2022-03-20 01:03:58 +08:00
Shengliang Guan 410982c8fe minor changes 2022-03-20 00:55:17 +08:00
afwerar 79057240bd [TD-13759]<fix>: redefine thread api. 2022-03-20 00:47:45 +08:00
afwerar caf1e0e860 [TD-13759]<fix>: redefine thread api. 2022-03-20 00:45:00 +08:00
Shengliang Guan 22d15fac31 minor changes 2022-03-20 00:33:27 +08:00
Shengliang Guan 916e569229 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-20 00:30:24 +08:00
Shengliang Guan fd7f61a069 shm 2022-03-20 00:30:07 +08:00
Yihao Deng a4ea6c7191
Merge pull request #10846 from taosdata/feature/supportQ
handle except
2022-03-20 00:18:50 +08:00
yihaoDeng 9a5d1139b6 handle except 2022-03-20 00:00:16 +08:00
Yihao Deng 2eb40c24e0
Merge pull request #10844 from taosdata/feature/supportQuery
Feature/support query
2022-03-19 23:57:06 +08:00
yihaoDeng 305057a04b handle except 2022-03-19 23:55:52 +08:00
Haojun Liao 3e1b750312 [td-13039] fix bug in show tables; 2022-03-19 23:52:28 +08:00
yihaoDeng 2d0c5ff5c3 handle except 2022-03-19 23:38:18 +08:00
Haojun Liao cf1e4507f3 [td-13039] refactor. 2022-03-19 23:12:58 +08:00
Yihao Deng 25569755e2
Merge pull request #10809 from taosdata/feature/supportQuery
handle except
2022-03-19 18:57:56 +08:00
Xiaoyu Wang 969d0ae642
Merge pull request #10843 from taosdata/feature/3.0_wxy
stream plan implement
2022-03-19 15:58:03 +08:00
Haojun Liao b0bc243413 [td-13039] fix bug in select * 2022-03-19 15:15:03 +08:00
Xiaoyu Wang e4dd627b20 stream plan implement 2022-03-19 03:02:31 -04:00
yihaoDeng 9d12273a9a merge 3.0 2022-03-19 14:35:24 +08:00
yihaoDeng 538a02170c merge 3.0 2022-03-19 14:10:35 +08:00
plum-lihui 24bd3b4d08 Merge branch '3.0' of https://github.com/taosdata/TDengine into 3.0 2022-03-19 12:44:18 +08:00
plum-lihui 4502370935 [add cases] 2022-03-19 12:43:53 +08:00
Hongze Cheng 0dd0f6f007
Merge pull request #10839 from taosdata/feature/tdb-merge
Feature/tdb merge
2022-03-19 11:55:07 +08:00
Shengliang Guan 1363021f43 shm 2022-03-19 09:48:29 +08:00
yihaoDeng 96db2f503b merge 3.0 2022-03-19 09:08:11 +08:00
Haojun Liao 3aab21c0fa [td-13039] fix bug in show tables/stables. 2022-03-19 00:13:07 +08:00
yihaoDeng 916dbe798b handle except 2022-03-18 23:38:47 +08:00
Cary Xu 7fc4d5d373
Merge pull request #10841 from taosdata/feature/TD-11463-3.0
refactor and put sma file in smaIndxUid dir
2022-03-18 22:27:02 +08:00
yihaoDeng a9b712ab45 handle except 2022-03-18 22:00:46 +08:00
yihaoDeng 3b147dd5bc handle except 2022-03-18 22:00:20 +08:00
Cary Xu 8a709fdbf3 refactor and put sma file in smaUid dir 2022-03-18 20:11:33 +08:00
Shengliang Guan 17215ffe90 shm 2022-03-18 19:43:09 +08:00
Li Minghao 712ff8f479
Merge pull request #10840 from taosdata/feature/3.0_mhli
Feature/3.0 mhli
2022-03-18 19:24:31 +08:00
Shengliang Guan 718e399455 shm 2022-03-18 19:21:41 +08:00
Minghao Li aea4e0f472 sync refactor 2022-03-18 19:09:22 +08:00
Hongze Cheng 6cd165bea7 disable TDB compile 2022-03-18 10:44:12 +00:00
Minghao Li 3ce39eec1c sync refactor 2022-03-18 18:42:49 +08:00
Hongze Cheng 74c2ec8e26 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/tdb-merge 2022-03-18 10:42:26 +00:00
Xiaoyu Wang ce50f40b84
Merge pull request #10838 from taosdata/feature/3.0_wxy
insert bugfix
2022-03-18 18:41:57 +08:00