Commit Graph

23111 Commits

Author SHA1 Message Date
yihaoDeng f5c13c13c6 support json 2022-03-01 22:36:19 +08:00
Zhiqiang Wang 153dc799ba
Merge pull request #10490 from taosdata/fix/ZhiqiangWang/TD-13736-console-exit-input-err
[TD-13736]<fix>: console exit input error.
2022-03-01 22:21:12 +08:00
afwerar 539f1238ba [TD-13736]<fix>: console exit input error. 2022-03-01 22:11:38 +08:00
Zhiqiang Wang 59132243bb
Merge pull request #10484 from taosdata/fix/ZhiqiangWang/TD-13736-console-exit-input-error
[TD-13736]<fix>: console exit input error.
2022-03-01 22:01:05 +08:00
Minghao Li aaf5e20fdc sync encode test 2022-03-01 20:29:49 +08:00
dapan1121 639b5102ce feature/qnode 2022-03-01 19:48:21 +08:00
Liu Jicong d14ca8f55e
Merge pull request #10483 from taosdata/feature/tq
add hb back
2022-03-01 19:41:51 +08:00
afwerar e697f63013 [TD-13736]<fix>: console exit input error. 2022-03-01 19:34:24 +08:00
Liu Jicong a7533ac2b2 add hb back 2022-03-01 19:31:07 +08:00
Liu Jicong 9d1d2b182d
Merge pull request #10481 from taosdata/feature/tq
add hb back
2022-03-01 19:25:28 +08:00
Liu Jicong 6a6bab9e98 fix hb crash 2022-03-01 19:24:00 +08:00
Minghao Li 12c202aa31 sync encode test 2022-03-01 18:35:07 +08:00
Liu Jicong 306cd7bef3 add hb back 2022-03-01 18:09:43 +08:00
Liu Jicong c5e4c86f0a
Merge pull request #10479 from taosdata/feature/tq
Feature/tq
2022-03-01 18:07:56 +08:00
Liu Jicong a68153ae92 merge from 3.0 2022-03-01 18:00:50 +08:00
Liu Jicong 4d0b896670 merge from 3.0 2022-03-01 17:58:02 +08:00
Liu Jicong b5f5400d30 fix 2022-03-01 17:49:14 +08:00
xiao-yu-wang 138ffcae78
Merge pull request #10478 from taosdata/feature/3.0_query_integrate_wxy
merge 3.0
2022-03-01 17:42:29 +08:00
Shengliang Guan c6fb4e928a Also start taosd when the config file does not exis 2022-03-01 17:34:55 +08:00
Haojun Liao 03629aabaf [td-13039] refactor. 2022-03-01 17:31:05 +08:00
Liu Jicong eae3d9a103 Merge branch '3.0' into feature/tq 2022-03-01 17:19:18 +08:00
Shengliang Guan 9359fe219d Merge remote-tracking branch 'origin/3.0' into feature/config 2022-03-01 17:18:43 +08:00
Shengliang Guan bbcfc1b7b2 update telemetry formater to cjson 2022-03-01 17:13:12 +08:00
Zhiqiang Wang cdc7f53a3f
Merge pull request #10475 from taosdata/fix/ZhiqiangWang/TD-13756-file-system-only-read-error
[TD-13756]<fix>: file system only read error.
2022-03-01 16:46:40 +08:00
Minghao Li 12050c9a2a sync encode test 2022-03-01 16:42:37 +08:00
afwerar a536f924f9 [TD-13756]<fix>: file system only read error. 2022-03-01 16:35:54 +08:00
Minghao Li 48bed2020c sync encode test 2022-03-01 16:19:42 +08:00
Liu Jicong 82c141ede8 merge from 3.0 2022-03-01 15:56:11 +08:00
Liu Jicong 2cb89fe8c1 Merge branch '3.0' into feature/tq 2022-03-01 15:49:26 +08:00
Minghao Li d57320031f sync ping 2022-03-01 15:16:44 +08:00
Shengliang Guan 0febebafb2 Merge remote-tracking branch 'origin/3.0' into feature/config 2022-03-01 15:05:21 +08:00
Haojun Liao da48a6522b Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-03-01 14:14:33 +08:00
Haojun Liao 3a6eecbabf [td-13039] refactor. 2022-03-01 13:25:24 +08:00
dapan1121 b2ad12cbb2
Merge pull request #10465 from taosdata/feature/qnode
Feature/qnode
2022-03-01 13:13:13 +08:00
dapan1121 125091ad05 feature/qnode 2022-03-01 11:14:28 +08:00
Xiaoyu Wang db8669a3ce TD-13037 merge 3.0 2022-02-28 21:40:50 -05:00
dapan1121 ec8d5f0434
Merge pull request #10464 from taosdata/hotfix/syncquery
change async query to sync query
2022-03-01 10:39:13 +08:00
dapan1121 712137ba18 feature/qnode 2022-03-01 10:32:36 +08:00
dapan1121 43f836ee15 feature/qnode 2022-03-01 10:26:56 +08:00
Xiaoyu Wang e6a89a8d99 Merge branch '3.0_query_integrate' of github.com:taosdata/TDengine into 3.0_query_integrate 2022-02-28 21:14:46 -05:00
Haojun Liao beae099a2d [td-13039] update the unit test. 2022-03-01 14:10:42 +08:00
Xiaoyu Wang 195ff4f52f TD-13705 parser integrate and CREATE DATABASE implement 2022-02-28 21:13:22 -05:00
dapan1121 e0faac42c4 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-03-01 09:50:44 +08:00
dapan1121 5f3e439ddc feature/qnode 2022-03-01 09:42:28 +08:00
dapan1121 c0c4b5c8c8 feature/qnode 2022-03-01 09:30:23 +08:00
Zhiqiang Wang ae4aef403e
Merge pull request #10459 from taosdata/fix/ZhiqiangWang/TD-13062-file-system-open-fopen
[TD-13062]<fix>: file system add stream.
2022-03-01 01:08:38 +08:00
afwerar d30b1020e5 [TD-13062]<fix>: file system add stream. 2022-03-01 01:01:23 +08:00
afwerar 24d7d68402 [TD-13062]<fix>: file system add stream. 2022-03-01 00:21:04 +08:00
afwerar c0fffd39f4 [TD-13062]<fix>: file system add stream. 2022-02-28 23:23:33 +08:00
afwerar 2b9dc8c7ea [TD-13062]<fix>: file system add stream. 2022-02-28 22:37:32 +08:00