Commit Graph

1711 Commits

Author SHA1 Message Date
wangmm0220 259c2043ec fix:merge error 2022-12-22 09:48:50 +08:00
WANG MINGMING 4dbc324564
Merge branch 'refact/submit_req_taosx' into refact/submit_req 2022-12-22 09:26:45 +08:00
Haojun Liao 8fdaa5be5a fix(query): fix syntax error on windows. 2022-12-19 14:27:24 +08:00
Haojun Liao 709c7d426c fix(query): fix error. 2022-12-19 11:55:53 +08:00
Haojun Liao fdade6d6a3
Merge branch '3.0' into refact/submit_req 2022-12-19 11:24:00 +08:00
Xiaoyu Wang d3cb2a3a0a merge main 2022-12-18 20:36:06 +08:00
Xiaoyu Wang 7d15bc670e Merge remote-tracking branch 'origin/3.0' into enh/mian_wxy 2022-12-18 19:32:32 +08:00
Shengliang Guan 7cd76335fe
Merge pull request #18951 from taosdata/enh/td-21144
enh: ignore head line in cvs file
2022-12-17 22:29:56 +08:00
dapan1121 49bcb15fab enh: ignore head line in cvs file 2022-12-14 16:34:56 +08:00
Xiaoyu Wang 9929c4aa72 merge 3.0 2022-12-13 14:25:53 +08:00
Xiaoyu Wang 2f9753c540 event window query 2022-12-13 14:18:03 +08:00
Xiaoyu Wang b69725adaa enh: shielding database option 'strict' 2022-12-13 10:00:24 +08:00
WANG MINGMING 473f5a3696
Merge pull request #18913 from taosdata/refact/submit_req_marks
fix:error in CI
2022-12-12 19:53:28 +08:00
wangmm0220 03df0ae1e1 fix:error in CI 2022-12-12 19:51:28 +08:00
Haojun Liao 48f7fc5c3d
Merge branch '3.0' into refact/submit_req 2022-12-12 18:11:17 +08:00
Xiaoyu Wang 6d28232189 fix: create stream error 2022-12-12 17:14:08 +08:00
Xiaoyu Wang 903804883d fix: create stream error 2022-12-12 15:35:50 +08:00
Xiaoyu Wang dc64bb5110 enh: shielding sql command 'alter database strict' 2022-12-12 13:22:23 +08:00
Xiaoyu Wang 9d6d05c405 merge 3.0 2022-12-12 11:06:52 +08:00
Haojun Liao 27ebafdbaa other: merge 3.0 2022-12-09 10:19:05 +08:00
dapan1121 bb0c337e43 fix: client retry issue 2022-12-09 10:06:07 +08:00
dapan1121 43a349bc1e fix: fix crash caused by null pointer 2022-12-09 07:12:57 +08:00
WANG MINGMING 35b5f185a2
Merge pull request #18833 from taosdata/refact/submit_req_marks
opti:performance of schemaless
2022-12-09 05:04:48 +08:00
wangmm0220 5d6494d5ae opti:modify logic for telnet and json in schemaless 2022-12-08 23:06:07 +08:00
dapan1121 617cd40541 fix: fix ut case issue and crash issue 2022-12-08 22:22:04 +08:00
Xiaoyu Wang 23a3a69ddd enh: merge getmetafromcache and getvgroupfromcache interface 2022-12-08 16:19:48 +08:00
Xiaoyu Wang 44b2cd1b73 enh: merge getmetafromcache and getvgroupfromcache interface 2022-12-08 15:24:34 +08:00
Xiaoyu Wang 0a075cb57a Merge remote-tracking branch 'origin/3.0' into enh/insertOptimize_wxy 2022-12-08 14:20:34 +08:00
dapan1121 39d35538a3 fix: fix compile error 2022-12-08 13:53:16 +08:00
kailixu 4a6f41f7f1 fix: keep option of database with precision ns 2022-12-08 11:56:29 +08:00
Xiaoyu Wang d5e3d750d1 enh: merge getmetafromcache and getvgroupfromcache interface 2022-12-08 11:14:06 +08:00
Xiaoyu Wang 7bd9cbd293 fix: insert row format error 2022-12-08 10:11:43 +08:00
Xiaoyu Wang bc36bc188e feat: event window 2022-12-08 09:36:37 +08:00
kailixu 3a3bf89cb8 fix: keep option of database with ns precision 2022-12-08 01:39:01 +08:00
Shengliang Guan 6d94afe48f
Revert "refact: adjust some assert cases" 2022-12-07 21:51:17 +08:00
Shengliang Guan 4172acf95d git lo 2022-12-07 19:39:53 +08:00
Xiaoyu Wang eff1b07886 fix: merge conflict 2022-12-07 19:12:55 +08:00
Xiaoyu Wang 9e5274df99
Merge branch '3.0' into refact/submit_req 2022-12-07 18:48:09 +08:00
Shengliang Guan d5126d469a refact: replcase ASSERT with tAssert 2022-12-07 18:42:48 +08:00
dapan1121 217694fd13 fix: client retry insert based on some error code 2022-12-07 15:28:07 +08:00
wangmm0220 443aa2ee3f fix:modify influxdb parse logic for sml 2022-12-07 11:05:33 +08:00
Xiaoyu Wang b680dccb46
Merge pull request #18753 from taosdata/refact/submit_req_wxy
fix: insert varchar error
2022-12-07 10:30:00 +08:00
Xiaoyu Wang fbdd37bee9 fix: insert varchar error 2022-12-07 10:29:17 +08:00
Hongze Cheng 2d85c7c451 Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/submit_req 2022-12-07 09:04:00 +08:00
wangmm0220 2c4b6ece3e fix:conflicts 2022-12-06 21:13:08 +08:00
wangmm0220 517c8b1d5a fix:modify influxdb parse logic for sml 2022-12-06 21:07:53 +08:00
Xiaoyu Wang ca26f55032 fix: memory leak 2022-12-06 20:40:18 +08:00
Xiaoyu Wang bc413b8fff feat: add stream option 'delete_mark' 2022-12-06 16:07:11 +08:00
Hongze Cheng 259b7e8a8a fix compile issue 2022-12-06 14:53:02 +08:00
Hongze Cheng 899d7b0bcc Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/submit_req 2022-12-06 14:37:22 +08:00