Commit Graph

818 Commits

Author SHA1 Message Date
Hongze Cheng 051217da69 Merge branch 'feature/tdb' of https://github.com/taosdata/TDengine into feature/meta 2022-03-28 08:45:17 +00:00
Cary Xu 151bc7e0fd Merge branch '3.0' into feature/TD-11463-3.0 2022-03-28 15:14:33 +08:00
Hongze Cheng 2003240959 more meta 2022-03-28 07:12:03 +00:00
Cary Xu e4a0489277 Merge branch '3.0' into feature/TD-11463-3.0 2022-03-28 15:00:16 +08:00
Liu Jicong 9a08ac3c5f stream support sma 2022-03-28 14:55:15 +08:00
Cary Xu 8529bf709e definition refactor 2022-03-28 14:45:19 +08:00
Liu Jicong a3b4de6631 stream support sma 2022-03-28 14:40:22 +08:00
Hongze Cheng 8ff248a308 meta with tdb compile 2022-03-28 06:35:00 +00:00
Liu Jicong 10319e3c65 Merge branch 'feature/tq' of github.com:taosdata/TDengine into feature/tq 2022-03-28 14:18:39 +08:00
Liu Jicong 90e4cab2af fix stream serialization 2022-03-28 14:16:58 +08:00
Liu Jicong 7d7cd10a77
Merge branch '3.0' into feature/tq 2022-03-28 12:00:51 +08:00
Liu Jicong e0f192046c multiple level stream schedule 2022-03-28 11:47:39 +08:00
Cary Xu ded8843367 SSDatablock refactor 2022-03-28 07:35:57 +08:00
Cary Xu 3adabbc489 Merge branch '3.0' into feature/TD-11463-3.0 2022-03-27 10:43:06 +08:00
Cary Xu d4c636589a update definition of SSchema/STColumn to support columns larger than 1MB(int16_t to int32_t) 2022-03-27 10:42:23 +08:00
afwerar c712e581b3 [TD-13772]<fix>: add timezone enum. 2022-03-26 17:58:56 +08:00
dapan1121 9363856465
Merge pull request #11017 from taosdata/feature/qnode
Feature/qnode
2022-03-26 15:34:06 +08:00
Liu Jicong 25344869a9 merge from 3.0 2022-03-26 14:52:39 +08:00
Liu Jicong 564236f230 refactor stream 2022-03-26 14:50:26 +08:00
Cary Xu 2dfecab056 refactor 2022-03-26 10:23:47 +08:00
Cary Xu 42eda785b0 merge 3.0 2022-03-26 10:00:15 +08:00
dapan1121 58e16e5fdc Merge remote-tracking branch 'origin/3.0' into feature/scheduler 2022-03-26 09:11:06 +08:00
afwerar 222db126bc [TD-13758]<fix>: redefine memory api. 2022-03-26 00:29:53 +08:00
Liu Jicong bdbf365ed0 merge from 3.0 2022-03-25 20:22:02 +08:00
Liu Jicong 59a4eec186 stream extract to module 2022-03-25 20:19:09 +08:00
Cary Xu 380a84e237 update 2022-03-25 16:52:32 +08:00
Cary Xu 1fbd79bafb add updateExpiredWindow test case 2022-03-25 16:40:59 +08:00
dapan1121 c34301e4e4 Merge remote-tracking branch 'origin/3.0' into feature/scheduler 2022-03-25 08:53:15 +08:00
Cary Xu 3494960b1a Merge branch '3.0' into feature/TD-11463-3.0 2022-03-25 07:51:03 +08:00
Cary Xu 585ae95d0d expired window/tsma msg adaption 2022-03-25 07:50:28 +08:00
dapan1121 3a41a00a63 Merge remote-tracking branch 'origin/3.0' into feature/scheduler 2022-03-24 18:32:39 +08:00
Xiaoyu Wang c67017ab8e
Merge pull request #10975 from taosdata/feature/3.0_wxy
SSubmitBlk add suid field
2022-03-24 17:31:06 +08:00
Xiaoyu Wang 1a785a5294 SSubmitBlk add suid field 2022-03-24 04:46:56 -04:00
dapan1121 94fda26620 Merge remote-tracking branch 'origin/3.0' into feature/scheduler 2022-03-24 16:44:25 +08:00
Liu Jicong 4cf88c35da modify stream task 2022-03-24 16:18:08 +08:00
Liu Jicong 3e455e374e Merge branch 'feature/shm' into feature/tq 2022-03-24 16:06:20 +08:00
dapan1121 85a1bd1cc9 Merge remote-tracking branch 'origin/3.0' into feature/scheduler 2022-03-24 14:42:02 +08:00
Haojun Liao a2d7ce3045 [td-14246] fix bug. 2022-03-24 11:43:39 +08:00
Liu Jicong d3e62358b1 merge from 3.0 2022-03-24 11:39:18 +08:00
Liu Jicong b0ebd174c1 add stream sink 2022-03-24 11:34:43 +08:00
Cary Xu e8b91539dd
Merge pull request #10957 from taosdata/feature/TD-11463-3.0
Feature/td 11463 3.0
2022-03-24 10:43:49 +08:00
Haojun Liao 8204984d0b
Merge pull request #10954 from taosdata/feature/3.0_liaohj
[td-13039] support add group by keys.
2022-03-24 10:28:13 +08:00
Cary Xu 4e8ebdef3a support drop sma in tsdb 2022-03-24 10:25:58 +08:00
Haojun Liao 311e65daa7 [td-13039] support add group by keys. 2022-03-23 22:53:49 +08:00
Cary Xu 6bd84f7fb2 drop tSma logic of tsdb 2022-03-23 21:06:17 +08:00
Shengliang Guan 2ba675ec40 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-23 20:16:33 +08:00
Shengliang Guan e9831674b2 sma 2022-03-23 20:12:50 +08:00
Haojun Liao f9e305afa4
Merge pull request #10945 from taosdata/feature/3.0_liaohj
[td-13039] fix null value retrieval.
2022-03-23 19:30:13 +08:00
Haojun Liao 21aaecd016 [td-13039] fix null value retrieval. 2022-03-23 19:10:24 +08:00
Liu Jicong 58122d07d7 add stream trigger 2022-03-23 17:00:21 +08:00
Liu Jicong d1363d9cb2 task running 2022-03-23 14:47:24 +08:00
Liu Jicong c3b3779713 Merge branch '3.0' into feature/tq 2022-03-23 10:44:50 +08:00
Liu Jicong 93347bec42 put next level info into task 2022-03-23 10:44:32 +08:00
Cary Xu ea034335bb encode info 2022-03-23 09:36:22 +08:00
Cary Xu d4cc6c1fe7 add bSma/rSma param 2022-03-23 07:58:07 +08:00
Cary Xu 044db54e74 refactor 2022-03-23 06:25:24 +08:00
Cary Xu fd61801ac8 Merge branch '3.0' into feature/TD-11463-3.0 2022-03-23 06:22:40 +08:00
Liu Jicong 7fce1e4c93 Merge branch 'feature/tq' of github.com:taosdata/TDengine into feature/tq 2022-03-22 19:48:59 +08:00
Liu Jicong c74b88afbb put tq header input vnd 2022-03-22 19:47:57 +08:00
Liu Jicong af67c49f0e
Merge branch '3.0' into feature/tq 2022-03-22 19:25:55 +08:00
Liu Jicong d3104e78ec stream task exec 2022-03-22 18:00:03 +08:00
dapan1121 1cb96f984a Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-22 17:15:59 +08:00
Xiaoyu Wang ef125eaa40 merge 3.0 2022-03-22 04:29:54 -04:00
Cary Xu 2dc845fba9 restore 2022-03-22 15:32:36 +08:00
dapan1121 96bc72c53b Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-22 15:21:03 +08:00
Cary Xu eb5471fdd6 tsdb merge 2022-03-22 14:57:16 +08:00
Cary Xu 3cdeed0d44 rename TDB to TSDB for log 2022-03-22 13:59:48 +08:00
Liu Jicong f72930eef6
Merge pull request #10880 from taosdata/feature/tq
fix memory error
2022-03-21 23:49:10 +08:00
Liu Jicong b08c3120bf fix memory error 2022-03-21 23:36:21 +08:00
Liu Jicong a36cfba9b9
Merge pull request #10879 from taosdata/feature/tq
Feature/tq
2022-03-21 21:54:30 +08:00
Liu Jicong 8a20b2fe50 fix memory error 2022-03-21 21:42:37 +08:00
Shengliang Guan 8738ef6980
Merge pull request #10875 from taosdata/feature/shm
refact dnode queue
2022-03-21 19:37:41 +08:00
Shengliang Guan 220fdfabe2 refact dnode queue 2022-03-21 19:08:25 +08:00
Haojun Liao 1c1c95edee [td-13039] merge 3.0 2022-03-21 18:34:42 +08:00
Haojun Liao f7a7d148c0 [td-13039] fix compiler error. 2022-03-21 18:09:23 +08:00
Haojun Liao 5566e9198d
Merge pull request #10865 from taosdata/feature/db_ss
[td-13039] support scan ssdatablock.
2022-03-21 17:40:13 +08:00
yihaoDeng 76b206fe6a Merge branch 'ddd' into sche 2022-03-21 16:47:51 +08:00
dapan1121 43336c0a39 feature/scheduler 2022-03-21 16:43:27 +08:00
Haojun Liao fcb058cee4 [td-13039] support scan ssdatablock. 2022-03-21 16:15:51 +08:00
Shengliang Guan 4049155736 shm 2022-03-21 15:51:32 +08:00
Shengliang Guan 50229512d3 refact vnode write queue 2022-03-21 14:39:35 +08:00
Shengliang Guan 90e9447370 adjust vnode queue 2022-03-21 14:12:58 +08:00
Xiaoyu Wang 9ca80596e4 merge 3.0 2022-03-21 02:00:30 -04:00
Shengliang Guan cd6d4a276b minor changes 2022-03-21 13:27:54 +08:00
Shengliang Guan 0f45064d8d Merge remote-tracking branch 'origin/feature/tq' into feature/shm 2022-03-21 10:15:17 +08:00
Shengliang Guan 3544df4112 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-20 10:19:01 +08:00
afwerar 79057240bd [TD-13759]<fix>: redefine thread api. 2022-03-20 00:47:45 +08:00
Shengliang Guan 916e569229 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-20 00:30:24 +08:00
Haojun Liao b0bc243413 [td-13039] fix bug in select * 2022-03-19 15:15:03 +08:00
Shengliang Guan 1363021f43 shm 2022-03-19 09:48:29 +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
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
Liu Jicong c56743d85a Merge branch '3.0' into feature/tq 2022-03-18 18:20:24 +08:00
Xiaoyu Wang eac1ccb5ec merge origin/3.0 2022-03-18 05:56:18 -04:00
Liu Jicong cc0c0293ea vnode process task exec 2022-03-18 17:55:39 +08:00
Xiaoyu Wang c2b4ec91ff tmq plan implement 2022-03-18 05:44:08 -04:00
Shengliang Guan cbef74653e Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-18 17:15:08 +08:00
Cary Xu 51ea336f08 Merge branch '3.0' into feature/TD-11463-3.0 2022-03-18 17:08:59 +08:00
afwerar 159c2671a2 [TD-13767]<fix>: forbid wchar_t. 2022-03-18 16:48:12 +08:00