Commit Graph

23240 Commits

Author SHA1 Message Date
Haojun Liao 2da902134b
Merge pull request #10792 from taosdata/feature/db_ser
[td-13039] refactor.
2022-03-17 15:27:28 +08:00
Haojun Liao a77239c1ad [td-13039] refactor. 2022-03-17 14:58:53 +08:00
Zhiqiang Wang ad0cdac40a
Merge pull request #10791 from taosdata/fix/ZhiqiangWang/TD-13063-prepare-for-win-compilation
[TD-13063]<fix>: prepare for win compilation.
2022-03-17 14:37:30 +08:00
Shengliang Guan 43083fa3e2 shm 2022-03-17 14:33:25 +08:00
afwerar 30c10ef8b3 [TD-13063]<fix>: prepare for win compilation. 2022-03-17 14:22:36 +08:00
Shengliang Guan b16e686809 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-17 13:28:15 +08:00
Cary Xu 5705b76e3b
Merge pull request #10786 from taosdata/feature/TD-11463-3.0
Feature/td 11463 3.0
2022-03-17 12:39:10 +08:00
Shengliang Guan 487c4f8d3d shm 2022-03-17 11:52:48 +08:00
Cary Xu b492966045 Merge branch '3.0' into feature/TD-11463-3.0 2022-03-17 11:47:01 +08:00
Cary Xu 91df290152 add REF for SSmaStat in case of delete SSmaStatItem when drop sma index 2022-03-17 11:46:34 +08:00
Shengliang Guan c022f478d4 shm 2022-03-17 10:49:03 +08:00
Shengliang Guan f31a7b4683 shm 2022-03-17 10:48:39 +08:00
Yihao Deng a6e2e85367
Merge pull request #10783 from taosdata/feature/supportQuery
Feature/support query
2022-03-16 23:09:14 +08:00
yihaoDeng 3843b689bb handle except 2022-03-16 22:19:43 +08:00
yihaoDeng 6d6a177eeb handle except 2022-03-16 22:08:47 +08:00
yihaoDeng 1d8ffd9581 handle except 2022-03-16 21:48:19 +08:00
Shengliang Guan 565774b985 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-16 21:35:48 +08:00
Shengliang Guan 01056438e9 shm 2022-03-16 21:29:53 +08:00
Minghao Li bc60b00d75 sync refactor 2022-03-16 21:22:56 +08:00
Minghao Li 5ab55c6554 sync refactor 2022-03-16 21:21:48 +08:00
Shengliang Guan 5832b6772c shm 2022-03-16 21:18:54 +08:00
Minghao Li 4d4fabf403 sync refactor 2022-03-16 21:11:20 +08:00
Li Minghao c660c9ad35
Merge pull request #10782 from taosdata/feature/3.0_mhli
Feature/3.0 mhli
2022-03-16 20:41:18 +08:00
Shengliang Guan 148af69ba6 shm 2022-03-16 20:25:37 +08:00
Yihao Deng f026d8bae5
Merge pull request #10776 from taosdata/feature/supportQuery
handle except
2022-03-16 20:24:59 +08:00
Minghao Li acea32ed41 sync refactor 2022-03-16 20:17:32 +08:00
Shengliang Guan 43cf0a9928 shm 2022-03-16 20:04:12 +08:00
Minghao Li fda9803c17 sync refactor 2022-03-16 20:03:22 +08:00
Liu Jicong cfd08b168c
Merge pull request #10781 from taosdata/feature/tq
task deploy and task exec
2022-03-16 19:51:57 +08:00
Liu Jicong 7f4c88b756 task deploy and task exec 2022-03-16 19:42:28 +08:00
Cary Xu d3564f3d36
Merge pull request #10780 from taosdata/feature/TD-11463-3.0
Feature/td 11463 3.0
2022-03-16 19:41:00 +08:00
Shengliang Guan 3487d4f855 shm 2022-03-16 19:39:43 +08:00
Cary Xu cfbd770483 Merge branch '3.0' into feature/TD-11463-3.0 2022-03-16 19:29:33 +08:00
Cary Xu 575ab14439 trow bug fix 2022-03-16 19:28:33 +08:00
Shengliang Guan a50e823327 shm 2022-03-16 19:27:49 +08:00
Shengliang Guan 63861e65d0 shm 2022-03-16 19:25:33 +08:00
yihaoDeng 3d4280c705 handle except 2022-03-16 19:23:45 +08:00
Shengliang Guan 2f7cdcd968 shm 2022-03-16 19:15:44 +08:00
Cary Xu b50ecc4e45
Merge pull request #10779 from taosdata/feature/TD-11463-3.0
Feature/td 11463 3.0
2022-03-16 19:14:11 +08:00
Shengliang Guan 04c4b13b39 rename 2022-03-16 19:08:00 +08:00
Shengliang Guan 7ab2b0a8e0 shm 2022-03-16 19:07:42 +08:00
Cary Xu 231ac079be refactor 2022-03-16 19:01:45 +08:00
Liu Jicong f5411f104f
Merge pull request #10777 from taosdata/feature/tq
Feature/tq
2022-03-16 18:51:40 +08:00
Liu Jicong 0ff5b63f4c merge from 3.0 2022-03-16 18:31:44 +08:00
Liu Jicong 18f254a017 task deploy and task exec 2022-03-16 18:29:31 +08:00
Shengliang Guan e10e8c8fec shm 2022-03-16 18:20:57 +08:00
Cary Xu e10f471b95 refactor 2022-03-16 18:19:26 +08:00
yihaoDeng d1c4e9ae92 handle except 2022-03-16 18:15:26 +08:00
Minghao Li f22226a44e sync refactor 2022-03-16 17:16:10 +08:00
Shengliang Guan 003864f902 shm 2022-03-16 16:59:45 +08:00