Commit Graph

47898 Commits

Author SHA1 Message Date
Benguang Zhao a2085703bf Merge branch main into FIX/TD-21812-main 2023-01-09 10:08:28 +08:00
Shengliang Guan 398161eb5f Merge branch 'main' into merge/mainto3.0_0108 2023-01-09 10:00:53 +08:00
Shengliang Guan 054c313369 fix: compile error in mac 2023-01-09 10:00:51 +08:00
Shengliang Guan f2d6ed8635
Merge pull request #19125 from taosdata/FIX/TD-21043-main
enh: vnodeCommit on consensus only
2023-01-09 09:41:34 +08:00
Shengliang Guan 35893eb9b1
Merge pull request #19435 from taosdata/fix/liaohj
fix(query): do not merge rows in last file when no data blocks exist.
2023-01-09 09:41:12 +08:00
Hongze Cheng 31fbf9e9d3 Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/long_query 2023-01-09 09:25:40 +08:00
Hongze Cheng fda6fccac8 more code 2023-01-09 09:24:26 +08:00
Benguang Zhao 90830e5410 fix: use pInfo->info.state.committed instead of the current one for async vnodeCommit 2023-01-09 09:08:59 +08:00
Haojun Liao 14c80364fb test:update sim script. 2023-01-08 23:06:53 +08:00
Haojun Liao 95a6720b2a fix(query): do not merge rows in last file when no data blocks exist. 2023-01-08 23:02:16 +08:00
Shuduo Sang 920fe88a3e
fix: taosbenchmark ctrlc handle (#19432)
* fix: taosbenchmark ctrl-c handler

* fix: update taos-tools d6fc15a

* fix: update taos-tools 94d6895
2023-01-08 21:26:11 +08:00
Shuduo Sang 45cfcdc047
fix: taosbenchmark ctrl-c handle for main (#19433) 2023-01-08 21:26:05 +08:00
wangmm0220 71a10b914f Merge branch 'main' of https://github.com/taosdata/TDengine into fix/TS-2385 2023-01-08 20:10:22 +08:00
Shengliang Guan d90eef6656 Merge branch '3.0' into merge/mainto3.0_0108 2023-01-08 09:54:21 +08:00
Hongze Cheng c4b6a99caf Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/long_query 2023-01-08 09:45:55 +08:00
Shengliang Guan 42d911bf8e Merge remote-tracking branch 'origin/main' into FIX/TD-21043-main 2023-01-08 09:44:07 +08:00
Shengliang Guan a3b5fca070
Merge pull request #19409 from taosdata/FIX/xsren/osFileUnlock
fix:Deadlock caused by assert modification
2023-01-08 09:42:20 +08:00
Shengliang Guan 08034c5161
Merge pull request #19407 from taosdata/enh/xsren/TD-21744/macPackage
Enh/xsren/td 21744/mac package
2023-01-08 09:39:03 +08:00
Shengliang Guan 0e561d0486
Merge pull request #19412 from taosdata/fix/main_bugfix_wxy
fix: set operator precision miss
2023-01-08 09:38:41 +08:00
facetosea c4908770f8 fix:merge 3.0 conflict 2023-01-07 22:08:26 +08:00
dapan1121 d70e32e7d3 fix: compile issue 2023-01-07 14:56:43 +08:00
Shengliang Guan 295eee4703
Merge pull request #19416 from taosdata/refact/submit_req_marks
fix:ASSERT in client mode & converity error
2023-01-07 11:01:01 +08:00
Shengliang Guan 45ef1c7405
Merge pull request #19402 from taosdata/chore/sangshuduo/TD-19391-oem-support
chore: prompt support
2023-01-07 10:58:42 +08:00
Shengliang Guan dc3bcbcb15
Merge pull request #19298 from taosdata/fix/TD-20098-2
fix; fix invalid vgroup id
2023-01-07 10:55:43 +08:00
Shengliang Guan 8c042f0eef
Merge pull request #19338 from taosdata/fix/TD-21697
fix: td-21697
2023-01-07 10:55:09 +08:00
Shengliang Guan 5c3eaad34e
Merge pull request #19342 from taosdata/refact/submit_req
fix:test cases error in schemaless
2023-01-07 10:54:49 +08:00
Shengliang Guan 5865b4ac74
Merge pull request #19403 from taosdata/fix/changeDefaultConfig
change default config value
2023-01-07 10:54:23 +08:00
Shengliang Guan 104a6f86dc
Merge pull request #19417 from taosdata/fix/TD-21664
fix(meta): cleanup coverity scan issues
2023-01-07 10:53:28 +08:00
Shengliang Guan 8ebd94aab8
Merge pull request #19422 from taosdata/fix/TD-21756
fix(vnd/snap): keep vnode stats transfered from leader
2023-01-06 23:11:40 +08:00
wangmm0220 e1020b7967 fix:add interface for taos_get_current_db 2023-01-06 19:20:31 +08:00
dapan1121 66e62bb010 fix: tsdb read invalid memory read issue 2023-01-06 19:19:31 +08:00
dapan1121 feb396270d
Merge pull request #19278 from taosdata/enh/TD-21108
feat: support crash report to telemetry server
2023-01-06 19:13:37 +08:00
dapan1121 cdd3c67c69
Merge pull request #19419 from taosdata/fix/TD-21784
fix: fix no available disk error
2023-01-06 19:01:08 +08:00
dapan1121 0addf051b4
Merge pull request #19414 from taosdata/fix/TD-19254-D
fix: coverity issue
2023-01-06 18:04:32 +08:00
Minglei Jin 610b5631aa fix(vnd/snap): keep vnode stats transfered from leader 2023-01-06 18:00:01 +08:00
Shengliang Guan 10e7d88e49
Merge pull request #19418 from taosdata/fix/TD-21789
fix: handle error while write vnodes.json
2023-01-06 17:14:14 +08:00
Shengliang Guan 9bcc86485e
Merge pull request #19411 from taosdata/fix/TS-2382_2
fix: remove privilege info on drop db / topic
2023-01-06 17:10:24 +08:00
Ganlin Zhao eae188b445 fix: fix no available disk error 2023-01-06 16:19:41 +08:00
dapan1121 602338b650
Merge pull request #19415 from taosdata/fix/TD-21783
fix: fix no available disk error
2023-01-06 16:13:27 +08:00
Shengliang Guan ef6c273c11 fix: minor changes 2023-01-06 15:56:27 +08:00
Shengliang Guan f5a6108ca0 fix: minor changes 2023-01-06 15:55:16 +08:00
Shengliang Guan 4a90f84e26 fix: minor changes 2023-01-06 15:50:27 +08:00
Minglei Jin 88185c1ad6 fix(meta): cleanup coverity scan issues 2023-01-06 15:43:54 +08:00
Shengliang Guan 71be00a811 fix: minor changes 2023-01-06 15:42:11 +08:00
Shengliang Guan e2ac984f61 fix: close file on sdbStopWrite 2023-01-06 15:40:09 +08:00
Shengliang Guan 7607a9788f fix: handle error while write json file 2023-01-06 15:39:56 +08:00
Hongze Cheng d7ec7ed936 more code 2023-01-06 15:24:27 +08:00
Shengliang Guan 675f0057cf fix: handle error while write dmEps.json 2023-01-06 15:24:24 +08:00
Shengliang Guan 3c619925f4 fix: handle error while write smnode.json 2023-01-06 15:16:07 +08:00
Shengliang Guan 03db839d4a fix: handle error while write vnodes.json 2023-01-06 15:15:54 +08:00