Commit Graph

6251 Commits

Author SHA1 Message Date
cadem a781d43577 fix/block-check-to-async-check 2023-04-24 10:23:43 +08:00
wangmm0220 9bd74ec5b2 Merge branch 'fix/TS-3222' of https://github.com/taosdata/TDengine into fix/TS-3222 2023-04-24 10:14:32 +08:00
Haojun Liao 134c0528ae Merge branch 'main' into fix/liaohj_main 2023-04-24 01:43:00 +08:00
wangmm0220 77e03bfd78 opti:change push mgr to consume msg for subscribe 2023-04-23 20:14:49 +08:00
liuyao 641c707b37 pause&resume 2023-04-23 17:37:10 +08:00
wangmm0220 4bc319c6dd Merge branch 'main' of https://github.com/taosdata/TDengine into fix/TS-3222 2023-04-23 15:15:33 +08:00
Xiaoyu Wang 35f02cdbad
Merge pull request #21013 from taosdata/FIX/TD-23768-main
fix: change tdbTbInsert to tdbTbUpsert for meta update in tdb
2023-04-23 15:15:17 +08:00
liuyao 5bd8fe5441 feat:add pause&resume 2023-04-23 15:09:01 +08:00
54liuyao 5089528a02 feat:stream pause&resume 2023-04-23 15:08:51 +08:00
Haojun Liao 6fc364db19 fix(query): add null ptr check. 2023-04-23 13:53:55 +08:00
Haojun Liao 9cf89c6b6f enh(tmq): add check for consumer Id; 2023-04-23 11:51:43 +08:00
Xiaoyu Wang 206887166c fix: vnode errcode setting error 2023-04-23 10:53:28 +08:00
yihaoDeng 917b07348c Merge branch 'fix/rocksdbState' into enh/rocksRevert 2023-04-23 02:37:26 +00:00
Haojun Liao 3dbe208712 enh(tmq): fix memory error and add retrieve wal info as required. 2023-04-22 15:34:46 +08:00
Benguang Zhao 3c53516299 fix: use tdbTbUpsert for metaUpdate functions 2023-04-21 19:24:09 +08:00
Minglei Jin 9918d326cc Merge branch '3.0' into fix/TD-23623 2023-04-21 18:39:07 +08:00
Minglei Jin a75d43a259 cache/read: remove unused extract function 2023-04-21 18:38:20 +08:00
Minglei Jin 12fc21ae84 cache/get: use pRow from reader 2023-04-21 18:34:58 +08:00
wangmm0220 6efbcfec4b Merge branch 'main' of https://github.com/taosdata/TDengine into fix/TS-3222 2023-04-21 17:46:35 +08:00
Minglei Jin 09c62e6ca2 fix values_list index when freeing 2023-04-21 16:30:00 +08:00
Minglei Jin 8e87b21a59 rocks/multi_get value: free rocks allocated memory 2023-04-21 16:23:40 +08:00
chenhaoran 7d7a0769b3 Merge remote-tracking branch 'origin/main' into enh/tsbsPerf.1 2023-04-21 16:20:37 +08:00
Minglei Jin 01d95b5e95 cache/read: use new interface with signle query 2023-04-21 16:07:22 +08:00
Minglei Jin 0394c6a50c free rocks errs array 2023-04-21 15:24:42 +08:00
Minglei Jin c9959b5bf6 dst slot for last_row 2023-04-21 14:18:04 +08:00
Haojun Liao b6f4cac619 fix(stream): set the correct offset version. 2023-04-21 13:35:24 +08:00
Haojun Liao 8fac91e265 refactor: do some internal refactor. 2023-04-21 09:38:51 +08:00
Haojun Liao 6c641cff39 fix(stream): fix error in start stream tasks. 2023-04-21 09:37:16 +08:00
Haojun Liao 471abd9160 log: update the log. 2023-04-20 23:39:13 +08:00
Haojun Liao 5e6c06e253 fix(stream): fix the race condition during create new stream tasks. 2023-04-20 23:21:18 +08:00
dm chen d594e4963f
Merge branch '3.0' into feat/learner 2023-04-20 19:11:06 +08:00
Haojun Liao 65fded4a28 fix(stream): set the correct number of tasks. 2023-04-20 19:03:43 +08:00
Haojun Liao f9801ba9c5 enh(stream): stop stream asap. 2023-04-20 18:58:07 +08:00
Haojun Liao 6f595fb5fd other: add some logs. 2023-04-20 18:50:44 +08:00
wangmm0220 5df7906a62 Merge branch '3.0' of https://github.com/taosdata/TDengine into enh/rocksRevert 2023-04-20 18:33:37 +08:00
Minglei Jin 7d896bbc85 last/empty_table: continue if table's empty 2023-04-20 17:36:46 +08:00
Haojun Liao c7e42d5422 other: do some internal refactor. 2023-04-20 17:30:02 +08:00
Haojun Liao 8323ad8670 enh(stream): add more check to stop stream asap. 2023-04-20 17:29:08 +08:00
Minglei Jin 1e51b2d781
Merge branch '3.0' into fix/TD-23623 2023-04-20 16:32:43 +08:00
Minglei Jin 642aa47887 last: first round implementation for column loading 2023-04-20 16:26:27 +08:00
Benguang Zhao 1b2fe38f75 enh: improve logging msg in metaSnapWrite 2023-04-20 16:22:16 +08:00
Haojun Liao b60b1796f7 fix(stream): add lock during check wal to create new stream task. 2023-04-20 15:53:41 +08:00
Benguang Zhao a21e0fe75e enh: propose vnode commit synchronously 2023-04-20 14:28:56 +08:00
Haojun Liao 742b5ee08c other: update wal logs level. 2023-04-20 13:42:16 +08:00
Haojun Liao c654f1145d enh(stream): add new msg for seek, and do some internal refactor. 2023-04-20 10:59:16 +08:00
cadem 8b16f4b118 config compitible 2023-04-19 18:02:04 +08:00
yihaoDeng 5402a6061f Merge branch 'dev' into enh/rocksRevert 2023-04-19 17:37:07 +08:00
cadem c22bd63ed4 vnode config compitible 2023-04-19 15:11:16 +08:00
Xiaoyu Wang 7cf9919ab0
Merge pull request #20964 from taosdata/enh/3.0_planner_optimize
feat: last queries with tags output can be read from cache
2023-04-19 14:34:32 +08:00
Haojun Liao 3f12156c53 enh(tmq): support seek in tmq. 2023-04-19 13:56:42 +08:00
Xiaoyu Wang 586b3945d1 feat: last queries with tags output can be read from cache 2023-04-19 13:09:11 +08:00
wangmm0220 594d68b8a4 fix:remove lock for consume handler 2023-04-19 11:46:59 +08:00
wangmm0220 14fd2e7904 fix:remove lock for consume handler 2023-04-19 11:44:52 +08:00
wangmm0220 1061eef144 fix:move consumer msg from fetch thread to query thread 2023-04-19 10:49:18 +08:00
wangmm0220 25542c26c7 fix:remove tmPushMsg in consumer 2023-04-19 10:43:13 +08:00
Minglei Jin 76edc16ce1 operator/cache-scan: pass col list down to tsdb cache 2023-04-19 10:04:48 +08:00
cadem 3b78d4382b add learner 2023-04-18 19:03:45 +08:00
Haojun Liao fb32ffd960 fix(stream): update the reference count value to be int32, insead of int8 2023-04-18 18:06:03 +08:00
dapan1121 2af63992ea
Merge pull request #20952 from taosdata/fix/TD-23639
fix: fix double free caused crash
2023-04-18 17:50:45 +08:00
Xiaoyu Wang 6669c3a5ad feat: last queries with tags output can be read from cache 2023-04-18 17:13:14 +08:00
Haojun Liao cc67b631f6 refactor: do some internal refactor. 2023-04-18 17:01:09 +08:00
Haojun Liao 9f16802451 fix(stream): set the initial value. 2023-04-18 16:42:40 +08:00
Ganlin Zhao e58bf86c33 fix local variable 2023-04-18 16:34:06 +08:00
Haojun Liao abfc2455e6 fix(stream): update the atomic variables. 2023-04-18 16:21:30 +08:00
Haojun Liao 7da998ecfb other: merge main. 2023-04-18 16:15:08 +08:00
Minglei Jin dee2ca3476 tsdb/cache: inplace_update are commented out 2023-04-18 16:09:42 +08:00
Haojun Liao 7a8dd0db45 refactor: update the log. 2023-04-18 16:08:51 +08:00
Minglei Jin dd42db0077 tsdb/mem table: remove unused codes 2023-04-18 15:09:13 +08:00
Minglei Jin e159c4ead9 first round rocks batch write implementation 2023-04-18 14:25:35 +08:00
Haojun Liao 76becf59b7
Merge pull request #20947 from taosdata/feature/3_liaohj
fix(stream): set the correct initial checkpoint versions.
2023-04-18 11:26:48 +08:00
Haojun Liao 97da34050b fix(query): fix invalid free. 2023-04-18 10:40:53 +08:00
Haojun Liao 7d3e5aa3d3 fix(query): set the table schema correctly when the table is dropped. 2023-04-18 09:03:30 +08:00
Haojun Liao 2ae05b8cf6 fix(stream): set the correct initial offset value. 2023-04-18 08:56:31 +08:00
liuyao 27d14f742d fix:stream memory leak 2023-04-17 17:27:02 +08:00
Ganlin Zhao d21628b2c9 fix: fix double free caused crash 2023-04-17 16:57:29 +08:00
Haojun Liao be90d2c511 fix(stream): disable stream task when no tasks exist. 2023-04-16 23:07:54 +08:00
Haojun Liao 1350af5267 fix(stream): set the correct initial checkpoint version to restore the operators state and add check for the initial destination tables. 2023-04-16 22:48:22 +08:00
Haojun Liao 04e042f21d Merge branch 'feature/3_liaohj' into enh/rocksRevert 2023-04-15 09:35:43 +08:00
Haojun Liao efb9ebe875
Merge pull request #20873 from taosdata/feature/3_liaohj
enh(stream): the stream will start after vnode restore being completed.
2023-04-15 09:34:34 +08:00
Hongze Cheng edf9fdbecc make it compile 2023-04-14 23:19:36 +08:00
Hongze Cheng bd1c8e1902 fix more code 2023-04-14 21:59:08 +08:00
Hongze Cheng 01bacc10ef fix: an important fix 2023-04-14 21:43:40 +08:00
Haojun Liao 1cd2268a99 Merge branch 'main' into feature/3_liaohj 2023-04-14 18:30:55 +08:00
Minglei Jin ec4ea9cf5d enh(cache/rocks): base for rocks put/get 2023-04-14 18:28:15 +08:00
Haojun Liao ab4b08a4b5 Merge branch 'feature/3_liaohj' into enh/rocksRevert 2023-04-14 17:44:50 +08:00
Haojun Liao e0cb8aa534 fix(stream): don't the initial task status and do some internal refactor. 2023-04-14 17:43:37 +08:00
dapan1121 423ec923ca enh: reuse tsdb cache reader 2023-04-14 14:30:20 +08:00
Haojun Liao eb0e1f848a fix(stream): remove unused tqreader, do some internal refactor, set the meta value for streamtask. 2023-04-14 12:00:09 +08:00
Haojun Liao b57c813681 other: merge feature/3_liaohj 2023-04-14 10:36:54 +08:00
Xiaoyu Wang 96d2c5b9e3
Merge pull request #20927 from taosdata/FIX/TD-23552-main
enh: try to propose vnode commit at vnode closing
2023-04-14 09:14:10 +08:00
Haojun Liao f8b672f09f other: merge main. 2023-04-14 09:07:18 +08:00
Haojun Liao 4d83118ff7 fix(stream): fix memory leak. 2023-04-13 23:49:14 +08:00
Haojun Liao 70b45a4cf0 fix(stream): all data should be extracted from wal. 2023-04-13 23:22:09 +08:00
Benguang Zhao d8386754ee enh: try to propose vnode commit at vnode closing 2023-04-13 19:45:24 +08:00
Xiaoyu Wang 7e51190bc8
Merge pull request #20914 from taosdata/fix/TD-22941-1
fix(tsdb/read): release bi cache entry before returning
2023-04-13 19:24:06 +08:00
Minglei Jin ab372d501a fix(tsdb/read): release bi cache entry before returning 2023-04-13 14:33:37 +08:00
Xiaoyu Wang a44d455e56 merge 3.0 2023-04-13 14:32:05 +08:00
Xiaoyu Wang 3d962cd950
Merge pull request #20905 from taosdata/fix/TD-22941
fix(tsdb/cache): fix block index ref releasing
2023-04-13 13:37:20 +08:00
Minglei Jin 589ed9d0ce fix(tsdb/cache): fix block index ref releasing 2023-04-13 12:09:44 +08:00
Minglei Jin ef219095cf fix(tsdb/read): remove duplicat schema fetching 2023-04-13 10:06:49 +08:00
Xiaoyu Wang 933660ae8d Merge remote-tracking branch 'origin/main' into fix/3.0_merge_main 2023-04-12 14:13:23 +08:00
Xiaoyu Wang 813591f993
Merge pull request #20872 from taosdata/fix/TD-23474
fix(tsdb/cache): skip schema updating for non ts row
2023-04-12 10:47:02 +08:00
Xiaoyu Wang 8b8ac0cd77 merge main 2023-04-12 10:43:28 +08:00
Haojun Liao f6315af0c9 other: merge main. 2023-04-11 19:41:17 +08:00
Haojun Liao 5ab54481f0 refactor: do some internal refactor. 2023-04-11 19:24:34 +08:00
Haojun Liao f083697dba refactor(tq): do some internal refactor. 2023-04-11 19:04:33 +08:00
Haojun Liao 24c9495772
Merge pull request #20857 from taosdata/fix/TS-3081
fix:optimize log & change the length of tag if tag is null in schemaless
2023-04-11 19:01:07 +08:00
yihaoDeng b24b91886a Merge branch 'dev3' into enh/rocksRevert 2023-04-11 10:59:00 +00:00
Minglei Jin 3ac5b35f4b fix(tsdb/cache): skip schema updating for non ts row 2023-04-11 18:57:11 +08:00
Haojun Liao aae2758863 fix(stream): disable the deploy msg when restart taosd. 2023-04-11 16:58:51 +08:00
Xiaoyu Wang 4c04b155d5 merge main 2023-04-11 15:56:28 +08:00
Haojun Liao 18479d8115 refactor: do some internall refactor. 2023-04-11 15:42:24 +08:00
wangmm0220 c40c695ea7 fix:optimize log & change the length of tag if tag is null in schemaless 2023-04-11 13:49:18 +08:00
Haojun Liao 15cceb5a5a refactor: do some internal refactors. 2023-04-11 11:53:10 +08:00
Haojun Liao a4ba5401f9 enh(stream): set the start version of all operators. 2023-04-11 10:01:36 +08:00
liuyao 524bb214e7 delete invalid code 2023-04-10 19:18:56 +08:00
Haojun Liao 497c9ea9c8 Merge branch 'main' into feature/3_liaohj 2023-04-10 17:57:26 +08:00
Haojun Liao 7419c0bfe9 enh(stream): the stream will start after vnode restore being completed. 2023-04-10 16:56:14 +08:00
Xiaoyu Wang 4dff8950c2
Merge pull request #20812 from taosdata/fix/TS-3025
fix(tsdb/read): use the correct schema with multilevel merging
2023-04-10 10:30:37 +08:00
Haojun Liao f5b52749c2 refactor: do some internal refactor. 2023-04-09 01:39:09 +08:00
Haojun Liao 5de76e4b72
Merge pull request #20809 from taosdata/fix/TD-23517
fix:[TD-23517] set offset type to wal if only meta & check if tag is …
2023-04-07 16:35:08 +08:00
Minglei Jin 8ae43fe6cb fix(tsdb/read): use the correct schema for mem/imem rows 2023-04-07 15:28:23 +08:00
Minglei Jin f262ac8230 fix(tsdb/read): use irow's schema instead of NULL 2023-04-07 14:37:56 +08:00
wangmm0220 05ec2b0928 fix:[TD-23517] set offset type to wal if only meta & check if tag is the same type in schemaless 2023-04-07 14:24:29 +08:00
Minglei Jin 1ff8511eb3 tsdb/row merger: comment init out 2023-04-07 13:43:07 +08:00
Minglei Jin 55f7e41f3b tsdb/row merger: remove tsdbRowMerge 2023-04-07 13:31:33 +08:00
Minglei Jin 360113115f fix(tsdb/row merger): remove unused code 2023-04-07 09:49:48 +08:00
Haojun Liao 871cfb4760
Merge pull request #20775 from taosdata/fix/TD-23450
fix:tq memory leak
2023-04-06 11:48:45 +08:00
Haojun Liao 2b2059ef18
Merge pull request #20534 from taosdata/fix/TD-22671
fix:error in TD-23218 & remove useless logic
2023-04-06 11:47:24 +08:00
yihaoDeng 5aff5aa93b add backpressure 2023-04-04 12:38:56 +00:00
54liuyao 519e2f1cfd fix:tq memory leak 2023-04-04 18:21:37 +08:00
yihaoDeng 628bb62c8a add backpressure 2023-04-04 07:20:05 +00:00
Haojun Liao c91d8a5901 Merge branch 'main' into feature/3_liaohj 2023-04-04 15:18:24 +08:00
Xiaoyu Wang e9d7a099cc merge main 2023-04-04 14:50:58 +08:00
Xiaoyu Wang 0e53e578a7
Merge pull request #20748 from taosdata/fix/TD-23473
ehn(plan/optimizer): remove tbname fetching with cached groupby
2023-04-04 09:36:56 +08:00
dapan1121 ec3c706c3b
Merge pull request #20739 from taosdata/fix/TS-3063
fix(query): fix interp tsdbReader external range not setting properly
2023-04-04 09:23:47 +08:00
wangmm0220 d651ba02ae fix:lose consume data because of exec close if consume while insert data 2023-04-03 19:54:52 +08:00
Haojun Liao d48be5c0ce refactor: do some internal refactor. 2023-04-03 18:23:35 +08:00
Haojun Liao a3ac8b647c refactor: do some internal refactor. 2023-04-03 18:20:35 +08:00
Haojun Liao 482c319bee refactor: do some internal refactor. 2023-04-03 18:07:28 +08:00
Haojun Liao 3ef7d43dae refactor: do some internal refactor. 2023-04-03 17:47:48 +08:00
Ganlin Zhao aa6a4efd5b fix(query): fix interp tsdbReader external range not setting properly 2023-04-03 16:18:16 +08:00
wangmm0220 2d6436c57d fix:modify log & sleep 500ms if data is inserting while consume 2023-04-03 11:24:22 +08:00
wangmm0220 858144145f fix:memory leak 2023-04-02 23:39:59 +08:00
wangmm0220 b029c8f157 fix:remove useless setmsg 2023-04-02 22:34:51 +08:00
wangmm0220 afcc3d2064 opti:code for tmq 2023-03-31 19:02:38 +08:00
wangmm0220 97b5c7abee fix:merge from main 2023-03-31 16:20:21 +08:00
Hongze Cheng 171d360cac
Revert "current from binary to json" 2023-03-31 15:25:00 +08:00
dapan1121 15578cf980
Merge branch 'main' into fix/cencVer 2023-03-30 15:36:30 +08:00
Haojun Liao 5f4cb41e28 fix(tmq): set correct start offset value. 2023-03-29 23:45:41 +08:00
Haojun Liao c8ad465a0d refactor: do some internal refactor. 2023-03-29 19:40:34 +08:00
Haojun Liao 56c98d7768 refactor: do some internal refactor. 2023-03-29 19:35:04 +08:00
wangmm0220 2243184a4d fix:conflicts 2023-03-29 17:53:05 +08:00
dapan1121 6a1150301e fix: column rows size 2023-03-29 17:30:20 +08:00
wangmm0220 9d9ae749d1 opti:tmq logic & fix CI cases 2023-03-29 17:27:04 +08:00
Haojun Liao 25245b9005 Merge branch 'main' into feature/3_liaohj 2023-03-29 16:40:12 +08:00
Haojun Liao 152fc5daab fix(stream):fix the race condition when creating new tsables. 2023-03-29 16:36:35 +08:00
dapan1121 a90354cd92 fix: restore debug code 2023-03-29 15:56:08 +08:00
dapan1121 9952be43f6 Merge remote-tracking branch 'origin/main' into fix/cencVer 2023-03-29 15:50:14 +08:00
dapan1121 4f06728c17 fix: restore sl level 2023-03-29 15:48:11 +08:00
dapan1121 84eef542d5 fix: memory rows count issue 2023-03-29 15:45:18 +08:00
Xiaoyu Wang b9d905c2d3
Merge pull request #20686 from taosdata/fix/liaohj
fix(tsdb/read): use correct scheme for mem & imem merging
2023-03-29 15:38:21 +08:00
Minglei Jin 91c16f0344 tsdb/read: remove dup mem schema fetching 2023-03-29 15:34:55 +08:00
Minglei Jin 7eb8a63944 Merge branch 'fix/liaohj' of https://github.com/taosdata/TDengine into fix/liaohj 2023-03-29 14:21:05 +08:00
Minglei Jin 8cf8ac84d7 fix(tsdb/read): use correct scheme for mem & imem merging 2023-03-29 14:19:15 +08:00
dapan1121 2714ce2af8 fix: rows count issue 2023-03-29 13:22:12 +08:00
dapan1121 0659814d16
Merge pull request #20674 from taosdata/fix/TS-3010
fix: query schema is old issue
2023-03-29 11:41:07 +08:00
Xiaoyu Wang eaf56916fe
Merge pull request #20678 from taosdata/FIX/TD-22975-main
enh: separate sync read and write
2023-03-29 11:09:31 +08:00
dapan1121 0327a8eaa3 fix: block rows number type 2023-03-29 10:46:56 +08:00
Haojun Liao 7a050d64bd fix(query): set ptr to be NULL. 2023-03-29 10:27:05 +08:00
dapan1121 702202d4af fix: fix block scan issue 2023-03-29 10:14:53 +08:00
Haojun Liao f1ff5dcec4 fix(query): use hashmap to keep the multiple schema. 2023-03-28 22:53:57 +08:00
dapan1121 a0c8dd52b1 fix: memory count issue 2023-03-28 19:42:09 +08:00
dapan1121 c5f37d284e fix: memory row count issue 2023-03-28 19:27:49 +08:00
dapan1121 e0f951e668 fix: memory rows issue 2023-03-28 19:15:38 +08:00
wangmm0220 d0c55ef572 fix:conflicts 2023-03-28 18:12:13 +08:00
Benguang Zhao ae8d87643f Merge branch 'main' into FIX/TD-22975-main 2023-03-28 18:00:51 +08:00
dapan1121 def8c9044e Merge remote-tracking branch 'origin/enh/TS-2967' into fix/cencVer 2023-03-28 17:47:41 +08:00
dapan1121 a87d35be08 fix: optimize performance 2023-03-28 17:40:46 +08:00
Haojun Liao 0ae2034ebb fix: fix syntax error. 2023-03-28 16:05:05 +08:00
Haojun Liao 7342aeb750 fix(tmq): fix the syntax error. 2023-03-28 15:42:53 +08:00
dapan1121 22ad3129b9 fix: query schema is old issue 2023-03-28 15:21:47 +08:00
Haojun Liao a883e57cf2 Merge branch 'main' into fix/liaohj 2023-03-28 15:07:32 +08:00
Haojun Liao 68f310dd48 refactor: do some internal refactor. 2023-03-28 15:05:10 +08:00
Haojun Liao 4fd3064fd9 refactor: do some internal refactor. 2023-03-28 14:43:37 +08:00
Haojun Liao ac9773b5df
Merge pull request #20670 from taosdata/fix/liaohj
refactor: do some internal refactor.
2023-03-28 14:32:10 +08:00
Haojun Liao c36c5253c5 refactor: do some internal refactor. 2023-03-28 13:31:40 +08:00
Haojun Liao fca79dbc53 Merge branch 'fix/liaohj' into main 2023-03-28 11:20:01 +08:00
Haojun Liao c158087d66 fix(tmq): kill the ongoing tsdb scans while transferring the ownership of vnode to other consumers. 2023-03-28 09:53:49 +08:00
Haojun Liao 5c128e2292 refactor: do some internal refactor. 2023-03-28 09:27:48 +08:00
dapan1121 61571d9296 enh: optimize count performance 2023-03-27 19:40:29 +08:00
Xiaoyu Wang 77f27bb9df
Merge pull request #20613 from taosdata/FIX/TD-23308-main
enh: disable timely vnodeCommit
2023-03-27 17:58:20 +08:00
wangmm0220 f1d67b6059 fix:conflict 2023-03-25 19:03:23 +08:00
wangmm0220 750cd8c5a4 fix:ci error 2023-03-25 16:33:47 +08:00
dapan1121 8a89550f16 fix: skiplist level 2023-03-25 13:10:14 +08:00
wangmm0220 9f5e435140 fix:conflict from main 2023-03-25 11:49:37 +08:00
dapan1121 dd12e41227
Merge pull request #20618 from taosdata/fix/TS-2974
fix: change float display mode
2023-03-25 09:19:04 +08:00
dapan1121 481091bae6 fix: sma load issue 2023-03-24 19:01:19 +08:00
dapan1121 8bf49fdbd2 fix: skiplist level 2023-03-24 17:16:06 +08:00
Haojun Liao b22cc82270 others: merge main. 2023-03-24 15:43:13 +08:00
Haojun Liao 8f6ac6d771 fix(tmq): wait for 2mins when subscribe topics. 2023-03-24 15:36:42 +08:00
dapan1121 4167e4c00c fix: some columns sma are not set issue 2023-03-24 15:20:27 +08:00
wangmm0220 57331cd71d Merge branch 'main' of https://github.com/taosdata/TDengine into fix/TD023101 2023-03-24 14:51:11 +08:00
wangmm0220 5d06474f2e fix:send data batch if consume wal where subscribe db 2023-03-24 14:43:29 +08:00
wangmm0220 1a2513d212 Merge branch 'fix/TD023101' of https://github.com/taosdata/TDengine into fix/TD023101 2023-03-24 10:12:12 +08:00
wangmm0220 bf78f63e22 fix:send data batch if consume wal where subscribe db 2023-03-24 10:10:52 +08:00
cadem 86ca5ce210 fix/trigger election by sync msg 2023-03-24 09:13:20 +08:00
Benguang Zhao 9be09492f0 enh: disable timely vnodeCommit 2023-03-24 09:05:06 +08:00
Xiaoyu Wang bddba107be
Merge pull request #20608 from taosdata/fix/TS-2960
fix(tdb/restore): rollback journal files backward
2023-03-23 19:47:31 +08:00
dapan1121 7f50b463bb
Merge pull request #20599 from taosdata/fix/mainT3.0
fix: merge main to 3.0
2023-03-23 16:17:01 +08:00
Xiaoyu Wang a5d8549cb1
Merge pull request #20593 from taosdata/FEAT/TD-23258-3.0
feat: support WAL_RETENTION_PERIOD and WAL_RETENTION_SIZE for alter database
2023-03-23 11:43:01 +08:00
Xiaoyu Wang 323d8ee0b4
Merge pull request #20598 from taosdata/FIX/TD-23187-main
fix: set pWriter->info.state.committed as ever in vnodeSnapWriterClose
2023-03-23 11:42:48 +08:00
wangmm0220 5f9c7e9a7d fix:[TS-2961] consume error change from snapshot to wal for taosx 2023-03-22 20:14:19 +08:00
wangmm0220 6fae38619d fix:error in TD-23218 & remove useless logic 2023-03-22 19:36:12 +08:00
dapan1121 e58afd12e1 fix: merge main to 3.0 2023-03-22 17:42:09 +08:00
wangmm0220 dd4cf0597b fix:error in optimize consume logic 2023-03-22 17:04:02 +08:00
dapan1121 5b02af6a91 fix: merge main to 3.0 2023-03-22 16:08:16 +08:00
Benguang Zhao 24af249f55 fix: set pWriter->info.state.committed as ever in vnodeSnapWriterClose 2023-03-22 16:05:57 +08:00
Benguang Zhao 0b101e4952 feat: support WAL_RETENTION_PERIOD and WAL_RETENTION_SIZE for alter database 2023-03-22 11:40:24 +08:00
Minglei Jin 0bf98096c9 fix(tsdb/cache): init isLast once for each fileset 2023-03-22 10:57:27 +08:00
Minglei Jin cb93ac2613 enh(tsdb/cache): make merge tree next one less 2023-03-22 10:50:34 +08:00
wangmm0220 c07e563ecd fix:error in optimize consume logic 2023-03-22 10:43:11 +08:00
Minglei Jin 0b31aac2c5 enh(tsdb/cache): skip data block with merge tree 2023-03-22 10:19:58 +08:00
cadem ea35f0ae11 feat/balance vgroup leader 2023-03-22 09:36:59 +08:00
yihaoDeng 914d391845 fix tag filter 2023-03-21 12:28:16 +00:00
Haojun Liao 69ca2b2f7b fix(tmq): do some internal refactor. 2023-03-21 19:40:36 +08:00
Haojun Liao c3acab2070 fix(tmq): do some internal refactor. 2023-03-21 19:38:34 +08:00
dapan1121 3ab55496c1
Merge pull request #20561 from taosdata/fix/TS-2891-M
fix: select ins_columns from stb/tb
2023-03-21 16:24:46 +08:00
Haojun Liao ca29dd344f other: merge main. 2023-03-21 14:04:52 +08:00
Haojun Liao d5a386a563 fix(client): fix coverity issues. 2023-03-21 14:03:36 +08:00
Haojun Liao 18b121c69c fix(tmq): fix the invalid write and do some internal refactor. 2023-03-21 13:45:43 +08:00
Haojun Liao ea0cc2c584
Merge pull request #20554 from taosdata/fix/TS-2828
fix: add retry if insert error with meta change
2023-03-21 09:01:22 +08:00
kailixu 179579f204 chore: more code 2023-03-20 17:41:22 +08:00
wangmm0220 f7b7320f5f fix:set offset if read wal none 2023-03-20 16:57:45 +08:00
wangmm0220 506c192bff fix:error in TD-23218 & remove useless logic 2023-03-20 16:26:15 +08:00
Haojun Liao ca1dffff45
Merge pull request #20508 from taosdata/fix/liaohj
fix(client): fix potential memory leak.
2023-03-20 16:11:22 +08:00
wangmm0220 f80078030c fix:error in TD-23218 & remove useless logic 2023-03-20 15:40:01 +08:00
Haojun Liao 625b2dc901
Merge pull request #20513 from taosdata/fix/TD-23136
fix:converity scan defects
2023-03-20 15:37:59 +08:00
Haojun Liao 2517f9bb83 fix(tmq): add some logs. 2023-03-20 15:27:16 +08:00
wangmm0220 c0b41ea0b3 fix:error in TD-23218 & remove useless logic 2023-03-20 14:09:13 +08:00
Haojun Liao a24d537d9e Merge remote-tracking branch 'origin/fix/liaohj' into fix/liaohj 2023-03-20 13:28:13 +08:00
Haojun Liao 4cb1c51d4e fix(tmq): update some logs. 2023-03-20 13:27:58 +08:00
yihaoDeng 192570ce77 fix tag filter 2023-03-20 04:14:57 +00:00
wangmm0220 a5144f0ba2 fix:set offset if read wal none 2023-03-20 10:10:07 +08:00
Haojun Liao a5e9fad0f9 fix(query): set correct lastkeyInstt. 2023-03-19 23:58:17 +08:00
Haojun Liao c678740968 refactor: do some internal refactor. 2023-03-19 19:22:43 +08:00
Haojun Liao 7e712a14b6 fix(tmq): adjust log. 2023-03-19 19:06:28 +08:00
Xiaoyu Wang f86c8d0d6e enh: optimize last pruning logic 2023-03-19 14:40:16 +08:00
Xiaoyu Wang 6277b2564b enh: optimize last pruning logic 2023-03-19 13:41:32 +08:00
Xiaoyu Wang 9affd11eb7
Merge pull request #20542 from taosdata/fix/main_bugfix_wxy
enh: optimize last pruning logic
2023-03-19 12:00:18 +08:00
Xiaoyu Wang 5a4fe943dc enh: optimize last pruning logic 2023-03-19 11:01:39 +08:00
Haojun Liao ae5155edcf fix(tmq): do some internal refactor. 2023-03-19 10:49:30 +08:00
Minglei Jin 3a5542bbbc fix(tsdb/cache): update nCols of merge tree to avoid assert failed 2023-03-19 10:19:49 +08:00
wangmm0220 ccba1d07c6 fix:error in TD-23218 & remove useless logic 2023-03-18 18:42:49 +08:00
wangmm0220 7616a283e3 fix:error in TD-23218 & remove useless logic 2023-03-18 18:23:38 +08:00
yihaoDeng afaa77cc3e fix tag filter 2023-03-18 10:01:45 +00:00
yihaoDeng f24e06f36b fix tag filter 2023-03-18 08:58:26 +00:00
dapan1121 859f2594ed fix: add sma load time 2023-03-17 15:21:43 +08:00
wangmm0220 0a54d00cd2 fix:converity scan defects 2023-03-17 14:54:27 +08:00
Shengliang Guan aa656c9c29
Merge pull request #20505 from taosdata/fix/TD-23196
ehn(tsdb/cache): skip invalid row or data block directly with merge tree
2023-03-17 13:19:06 +08:00
Haojun Liao d5a8a4aefe
Merge pull request #20502 from taosdata/fix/liaohj
fix(client): set the initial value for num_of_rows.
2023-03-17 12:50:04 +08:00
Minglei Jin ca115b1c87 fix(tsdb/cache): break loop to return current row 2023-03-17 11:41:17 +08:00
wangmm0220 4fdef7421c fix:add log for taosCreateLog error 2023-03-17 10:50:54 +08:00
Minglei Jin a8d146c512 ehn(tsdb/cache): skip invalid row or data block directly with merge tree 2023-03-17 10:22:36 +08:00
Haojun Liao 970155a845 fix(query): fix coverity issues. 2023-03-16 21:53:34 +08:00
wangmm0220 6323a6e801 fix:conflicts 2023-03-16 19:18:07 +08:00
wangmm0220 14970478dc fix:conflicts 2023-03-16 19:15:08 +08:00
wangmm0220 fa2e7b234c fix:add log for schemaless & sleep longer if modify schema error 2023-03-16 19:13:15 +08:00
Shengliang Guan 925693c8a9
Merge pull request #20493 from taosdata/fix/TD-23172
ehn(tsdb/cache): load necessary columns only
2023-03-16 15:49:04 +08:00
yihaoDeng 3ac11ce87a enh: change log 2023-03-16 06:17:45 +00:00
Minglei Jin b1949b5584 fix(tsdb/cache): skip remaining rows in current data block 2023-03-16 14:11:34 +08:00
Haojun Liao 345b46769c
Merge pull request #20490 from taosdata/fix/liaohj
fix(tmq): disable non-leader vnode responsing the poll request.
2023-03-16 14:00:42 +08:00
Minglei Jin 6e0343fc08 enh(tsdb/cache): load necessary columns only 2023-03-16 11:18:36 +08:00
Haojun Liao a1682664f2 fix(tmq): disable non-leader vnode responsing the poll request. 2023-03-16 10:12:34 +08:00
yihaoDeng ef092c1cce enh: add queue limit 2023-03-15 11:54:36 +00:00
Shengliang Guan af4532dc63
Merge pull request #20476 from taosdata/fix/TD-23163
enh(tsdb/cache): skip invalid datablock directly when traversing fs with last
2023-03-15 19:03:48 +08:00
Minglei Jin 04d501d64a fix: destroy aColArray anyway 2023-03-15 17:41:29 +08:00
Minglei Jin f1414355e3 tsdb/cache: skip invalid datablock directly when traversing fs with last 2023-03-15 16:24:36 +08:00
Haojun Liao 36cec7894b
Merge pull request #20472 from taosdata/fix/liaohj
fix(query): set the correct cached tags list key length, and update s…
2023-03-15 15:56:50 +08:00
Haojun Liao 52576071ae refactor: do some internal refactor. 2023-03-15 14:37:48 +08:00
Haojun Liao 253a760810 fix(query): set the correct cached tags list key length, and update some logs. 2023-03-15 14:30:12 +08:00
Shengliang Guan 09ca41b3f7
Merge pull request #20467 from taosdata/fix/TS-2893
fix:create same sub table
2023-03-15 14:07:47 +08:00
54liuyao d5defa3def fix:create same sub table 2023-03-15 11:10:55 +08:00
Hongze Cheng e43b606917 current from binary to json 2023-03-15 10:48:51 +08:00
Benguang Zhao cc76d78673 enh: separate sync read and write events 2023-03-14 20:35:39 +08:00
Haojun Liao 32ddecc347 other: merge main. 2023-03-14 12:13:09 +08:00
Shengliang Guan e98b32a69f
Merge pull request #20427 from taosdata/fix/main_bugfix_wxy
fix: last redundant read stt file
2023-03-14 09:41:19 +08:00
Shengliang Guan 214c595491
Merge pull request #20412 from taosdata/fix/TD-23095
fix:auto fill null column
2023-03-14 09:36:57 +08:00
Shengliang Guan bf03965931
Merge pull request #20413 from taosdata/FIX/TD-22564-main
enh: not allow to propose if fsm applying progress lagging behind too far
2023-03-14 09:36:04 +08:00
Shengliang Guan 6989f1be61
Merge pull request #20418 from taosdata/fix/TD-22671
fix:deal with ASSERT in tmq
2023-03-14 09:34:52 +08:00
Xiaoyu Wang ca39dfcf2d feat: show vgroup display num of cache tables 2023-03-13 17:21:32 +08:00
Haojun Liao 731a2138df fix(tmq): fix error in tmq. 2023-03-13 17:08:17 +08:00
Xiaoyu Wang 62377619ba enh: optimizing stt file reading in last query 2023-03-13 15:05:24 +08:00
Haojun Liao 7f2aae69d4 fix(tmq): fix error in taosx 2023-03-13 01:54:29 +08:00
Xiaoyu Wang 25778754e2 fix: last redundant read stt file 2023-03-12 22:36:26 +08:00
Xiaoyu Wang 45e38d258c fix: last redundant read stt file 2023-03-12 20:40:17 +08:00
Haojun Liao 564e9bb833 Merge branch 'main' into fix/liaohj 2023-03-12 14:38:38 +08:00
wangmm0220 0e2cf0ed73 fix:deal with ASSERT in tmq 2023-03-11 16:51:34 +08:00
Xiaoyu Wang a846c26ef9 merge main 2023-03-11 16:14:27 +08:00
wangmm0220 9cc7a9f504 fix:deal with ASSERT in tmq 2023-03-11 16:12:11 +08:00
Shengliang Guan 584f213739
Merge pull request #20401 from taosdata/fix/main_bugfix_wxy
fix: error in last cache handle deleted data
2023-03-11 15:43:55 +08:00
54liuyao 84ef1c78d4 fix:auto fill null column 2023-03-11 11:33:50 +08:00
Xiaoyu Wang 38a6d02ca9 Merge remote-tracking branch 'origin/main' into fix/main_bugfix_wxy 2023-03-11 10:58:47 +08:00
Benguang Zhao d679eaf648 enh: update pMnode->applied only when pMsg->code as zero 2023-03-10 18:10:34 +08:00
Xiaoyu Wang 11e55f028b fix: error in last cache handle deleted data 2023-03-10 17:49:27 +08:00
Hongze Cheng 7e071ff458 enh: optimize snapshot transfer 2023-03-10 16:01:40 +08:00
Shengliang Guan cf1bf07bbb
Merge pull request #20387 from taosdata/fix/main_bugfix_wxy
enh: optimize last/last_row cost when the cache was first loaded
2023-03-10 14:51:45 +08:00
Haojun Liao 05ddf68247 fix(tmq): fix invalid free. 2023-03-10 14:27:34 +08:00
Haojun Liao d8807d3d5a fix(tmq): fix memory leak. 2023-03-10 14:23:16 +08:00
Xiaoyu Wang 4e4f7de0ab enh: optimize last/last_row cost when the cache was first loaded 2023-03-10 12:00:17 +08:00
Haojun Liao 0d1b2e4b5a fix(tmq): use before remove hash item. 2023-03-10 10:31:53 +08:00
Shengliang Guan c70c9546f2
Merge pull request #20372 from taosdata/fix/main_bugfix_wxy
enh: optimize last/last_row cost when the cache was first loaded
2023-03-10 10:07:22 +08:00
Shengliang Guan 37bc466f59
Merge pull request #20373 from taosdata/fix/TS-2853
fix:get dest table version
2023-03-10 10:05:01 +08:00
Haojun Liao 691cb08e88 refactor: remove some unused attributes. 2023-03-10 09:23:03 +08:00
Haojun Liao 09e84884be refactor: remove invalid assert 2023-03-09 23:31:29 +08:00
Haojun Liao 03aa391859 fix(tmq): add lock before close the tsdbreader. 2023-03-09 23:03:51 +08:00
Benguang Zhao 96e70c2795 enh: update logging msg in vnodeRestoreFinish 2023-03-09 20:05:19 +08:00
54liuyao 5acf665b7e fix:get dest table version 2023-03-09 19:36:10 +08:00
Benguang Zhao 5e53b1225b enh: finish restore with commit and applied indexes instead of num of items in apply queue 2023-03-09 19:35:42 +08:00
Xiaoyu Wang 47417e003e enh: optimize last/last_row cost when the cache was first loaded 2023-03-09 18:54:15 +08:00
Benguang Zhao 1392711e66 enh: add fsm FpAppliedIndexCb to get the current applied index 2023-03-09 18:14:04 +08:00
Benguang Zhao 9d10739908 enh: send rsp of negotiation failure ahead of apply queue 2023-03-09 16:18:44 +08:00
Hongze Cheng afd01bb9b6 Merge branch 'main' of https://github.com/taosdata/TDengine into feat/TS-2846 2023-03-09 15:26:04 +08:00
Hongze Cheng 16262512b2 feat: alter stt_trigger and minrows 2023-03-09 15:25:47 +08:00
Shengliang Guan 00854f677c
Merge pull request #20335 from taosdata/fix/TD-22753
fix: unit  sma and tag index error msg
2023-03-09 15:20:47 +08:00
Xiaoyu Wang 66bb55187d Merge remote-tracking branch 'origin/main' into fix/3.0_merge_main 2023-03-08 18:30:24 +08:00
yihaoDeng 01a5d5d219 unit sma and tag index error msg 2023-03-08 18:16:29 +08:00
yihaoDeng d8d74b3514 unit sma and tag index error msg 2023-03-08 16:02:46 +08:00
Hongze Cheng 05688386a0 little fix 2023-03-08 15:19:55 +08:00
Hongze Cheng a56c99daac fix: add more msg check 2023-03-08 14:45:04 +08:00
Hongze Cheng b5b6f31023 Merge branch 'main' of https://github.com/taosdata/TDengine into feat/compact_with_time_range 2023-03-08 13:47:40 +08:00
Xiaoyu Wang 4c8bab7e58 merge main 2023-03-08 10:59:33 +08:00
Xiaoyu Wang 0dc34018b6 fix: insert data crash after empty table last cache 2023-03-08 10:06:48 +08:00
Hongze Cheng dc0d7c26ea Merge branch 'main' of https://github.com/taosdata/TDengine into feat/compact_with_time_range 2023-03-08 08:53:56 +08:00
Hongze Cheng 89281ee488 compact with time range 2023-03-07 21:46:34 +08:00
Shengliang Guan fe729a4756
Merge pull request #20305 from taosdata/fix/main_bugfix_wxy
fix: taosd crash when modify the schema and query last_row
2023-03-07 20:31:18 +08:00
Xiaoyu Wang 163224f4e2 fix: taosd crash when modify the schema and query last_row 2023-03-07 19:42:05 +08:00
Xiaoyu Wang ab86f6abee fix: taosd crash when modify the schema and query last_row 2023-03-07 18:15:17 +08:00
Shengliang Guan 4ea87deef7
Merge pull request #20301 from taosdata/fix/main_bugfix_wxy
fix: insert data crash after empty table last_row cache
2023-03-07 18:08:23 +08:00
Haojun Liao d54ae0c840 fix(tmq): free reader after check the reader status. 2023-03-07 17:49:20 +08:00
Xiaoyu Wang ab5cce806c fix: fix: after the last_row cache is created, modify the schema and query again, resulting in taosd crash 2023-03-07 16:25:46 +08:00
Xiaoyu Wang 8e6534d9f3 fix: insert data crash after empty table last_row cache 2023-03-07 16:06:56 +08:00
Shengliang Guan 325b3439df
Merge pull request #20290 from taosdata/fix/main_bugfix_wxy
fix: after the last cache is created, modify the schema and query again, resulting in taosd crash
2023-03-07 11:07:07 +08:00
Hongze Cheng 424a37fd3a some code 2023-03-07 10:20:48 +08:00
Xiaoyu Wang bc9eb47e04 fix: after the last cache is created, modify the schema and query again, resulting in taosd crash 2023-03-07 10:14:39 +08:00
Haojun Liao 2790368a03
Merge pull request #20269 from taosdata/feature/3_liaohj
fix(qurey): fix som errors and add some logs.
2023-03-06 20:38:22 +08:00
Xiaoyu Wang b2247a10cb fix: last cache invalid write 2023-03-06 18:00:53 +08:00
wangmm0220 86ef6522ae fix:wal curVersion error if switch to wal 2023-03-06 17:40:02 +08:00
Shengliang Guan 7edcbfd58b Merge branch 'fix/stopFunc' into feature/3_liaohj 2023-03-06 09:43:00 +08:00
Haojun Liao 22a85734c6 fix(mq): add more chek for balance couner to avoid the negative value emerges. 2023-03-05 13:23:50 +08:00
wangmm0220 e54e12eff0 fix:give error if col is same in schemless & fix json parse error in TD-22903 2023-03-04 11:57:27 +08:00
Haojun Liao 24bb33f24a refactor: add some logs. 2023-03-03 18:34:38 +08:00
Shengliang Guan 25e0ed8cb5 Merge branch 'fix/TD-22951' into feature/3_liaohj 2023-03-03 18:21:55 +08:00
Hongze Cheng 7f62507e4a Merge branch 'main' of https://github.com/taosdata/TDengine into 3.0.3.00302 2023-03-03 16:41:35 +08:00
Shengliang Guan 658bd47315 Merge remote-tracking branch 'origin/main' into feature/3_liaohj 2023-03-03 10:56:09 +08:00
Haojun Liao e8c11c58f0 fix(tq): add some logs. 2023-03-03 10:20:52 +08:00
Xiaoyu Wang ed5a58fbb6
Merge pull request #20243 from taosdata/fix/main_bugfix_wxy
fix: last cache read problem after schema change
2023-03-02 20:52:22 +08:00
Hongze Cheng ed48296acd Merge branch 'main' of https://github.com/taosdata/TDengine into 3.0.3.00302 2023-03-02 19:47:22 +08:00
Xiaoyu Wang 7649ede074 fix: last cache read problem after schema change 2023-03-02 19:45:21 +08:00
Xiaoyu Wang b09bb40e2d
Merge pull request #20242 from taosdata/fix/auto_retention
fix: auto retention
2023-03-02 19:32:25 +08:00
Xiaoyu Wang 7deee1c4c7 fix: last cache read problem after schema change 2023-03-02 18:22:42 +08:00
Hongze Cheng dfaf26dfc5 add data scan 2023-03-02 18:10:02 +08:00
Shengliang Guan 5840e2f770
Merge pull request #20152 from taosdata/fix/TD-22764
fix:core dump if data block size is 0
2023-03-02 17:29:03 +08:00
Haojun Liao 37281ae17f
Merge pull request #20228 from taosdata/feature/3_liaohj
fix(query): record the correct last accessed key in the stt file.
2023-03-02 17:13:31 +08:00
Hongze Cheng e0819db5de fix: auto retention 2023-03-02 15:06:11 +08:00
dapan1121 341f813a61 Merge remote-tracking branch 'origin/main' into fix/TS-2770 2023-03-02 08:29:37 +08:00
Haojun Liao 8d32d256ad fix(query): set correct lastkeyinstt. 2023-03-02 00:48:17 +08:00
Haojun Liao c5102c9ea5 Merge branch 'main' into feature/3_liaohj 2023-03-01 23:31:57 +08:00
Haojun Liao 443852cc3f fix(query): set correct last key. 2023-03-01 21:46:25 +08:00
Xiaoyu Wang 0fe9b5ca19
Merge pull request #20222 from taosdata/feat/compact
more compact to enterprise
2023-03-01 20:19:42 +08:00
Haojun Liao 3327beba1e fix(query): record the correct last accessed key in the stt file. 2023-03-01 14:56:51 +08:00
Xiaoyu Wang 74a4051881 move compact to enterprise 2023-03-01 14:48:31 +08:00
dapan1121 ee70606f19 fix: projection query in descending order result error issue 2023-03-01 14:48:15 +08:00
Haojun Liao 10a119e3fb
Merge pull request #20106 from taosdata/fix/TD-22667-3.0
fix:error by coverity scan
2023-03-01 13:31:59 +08:00
Haojun Liao a3ffddba2d
Merge pull request #20204 from taosdata/fix/3_coverity
fix(query): fix coverity issue.
2023-03-01 09:28:36 +08:00
Hongze Cheng d319d6fe00 more compact to enterprise 2023-02-28 19:52:03 +08:00
Xiaoyu Wang e36d9a4c25 merge main 2023-02-28 16:13:28 +08:00
cyang 2164acce88 Merge branch 'main' of https://github.com/taosdata/TDengine into fix/TD-22764 2023-02-28 16:10:09 +08:00
Haojun Liao f1f9e570e6 Merge branch '3.0' into fix/3_coverity 2023-02-28 16:03:28 +08:00
Haojun Liao dc45ec2660 fix(query): set the correct bucket index. 2023-02-28 15:17:32 +08:00
wangmm0220 986ae9c4d0 fix:conflicts 2023-02-28 15:11:16 +08:00
Haojun Liao 22e52ebb38 fix(query): fix block distribution error. 2023-02-28 14:25:19 +08:00
Haojun Liao 4172041ec8 fix(query): fix error in displaying block distribution. 2023-02-28 14:20:14 +08:00
Haojun Liao 60188e82a6 fix(query): fix coverity issue. 2023-02-28 13:42:19 +08:00
Haojun Liao 1ac30b7710
Merge pull request #20169 from taosdata/feature/3_liaohj
refactor: do some internal refactor and add some logs for tmq.
2023-02-28 12:01:22 +08:00
WANG MINGMING 5dfc9ed4d0
Merge branch '3.0' into fix/TD-22667-3.0 2023-02-28 09:52:34 +08:00
Haojun Liao 52a8912969
Merge pull request #20183 from taosdata/fix/TD-22797
fix: avoid filter slow when not exist target value
2023-02-28 09:18:46 +08:00
Haojun Liao d18dd3067b other: merge main. 2023-02-28 00:38:37 +08:00
Haojun Liao 5e9f53560d
Merge branch 'main' into feature/3_liaohj 2023-02-27 18:23:35 +08:00
Hongze Cheng 1fa5d02b94 more code 2023-02-27 18:20:09 +08:00
Hongze Cheng d963a4f20c Merge branch 'main' of https://github.com/taosdata/TDengine into feat/auto_retention 2023-02-27 18:11:12 +08:00
Hongze Cheng ee36cf8aca mroe code 2023-02-27 18:11:04 +08:00
Hongze Cheng 8e3084ecc0 feat: auto retention 2023-02-27 18:09:51 +08:00
Xiaoyu Wang 6a5934983c
Merge pull request #20181 from taosdata/fix/3.0_merge_main
merge main
2023-02-27 17:08:35 +08:00
yihaoDeng c13cea4f44 fix: avoid filter slow when filter not exist value 2023-02-27 14:34:38 +08:00
Xiaoyu Wang efa56d5352 merge main 2023-02-27 14:18:03 +08:00
Xiaoyu Wang f97a140a3c merge 3.0 2023-02-27 14:16:33 +08:00
cyang 6a15c36fc1 Merge branch 'main' of https://github.com/taosdata/TDengine into fix/TD-22764 2023-02-27 10:05:05 +08:00
54liuyao f2dfe5ab74 fix:create same sub table 2023-02-27 09:55:34 +08:00
wangmm0220 c638564179 fix:confilcts from main 2023-02-26 23:09:57 +08:00
Haojun Liao b46098793d refactor: do some internal refactor and add some logs for tmq. 2023-02-26 12:16:45 +08:00
dapan1121 77295df8ec
Merge pull request #20161 from taosdata/fix/TS-2729
fix: table scan crash issue
2023-02-26 07:45:17 +08:00
dapan1121 50ee40308b fix: realloc uid list 2023-02-25 16:10:48 +08:00
Haojun Liao 0369ff2231 other: merge main. 2023-02-25 15:42:32 +08:00
dapan1121 10e35f1ed0 fix: free pointer issue 2023-02-25 14:15:24 +08:00
Haojun Liao 514369c611 other: merge main 2023-02-25 11:06:13 +08:00
Haojun Liao d6fca036e5 refactor: do some internal refactor. 2023-02-25 11:02:42 +08:00
Haojun Liao 90c6641cff
Merge pull request #20131 from taosdata/fix/coverity_yihao
fix: fix asan problem
2023-02-25 10:42:39 +08:00
Xiaoyu Wang d6dd087f84 merge main 2023-02-25 10:29:20 +08:00
Xiaoyu Wang 320ad8d1f2
Merge pull request #20150 from taosdata/fix/TD-22710
fix: compact wrong data count
2023-02-25 10:02:56 +08:00
Xiaoyu Wang 5856a39827
Merge pull request #20123 from taosdata/fix/3.0_merge_main
merge main
2023-02-25 10:01:26 +08:00
dapan1121 05bd600ef8 fix: table scan crash issue 2023-02-25 09:34:37 +08:00
Yihao Deng 22b1bc1049
Merge branch '3.0' into fix/coverity_yihao 2023-02-24 21:22:58 +08:00
wangmm0220 54a546931c fix:optimize version logic in tmq and remove useless code 2023-02-24 19:22:08 +08:00
Haojun Liao 097723f446
Merge pull request #20151 from taosdata/feature/3_liaohj
fix(query): expand output buffer.
2023-02-24 18:56:51 +08:00
Hui Li 965d91572a
Merge pull request #20148 from taosdata/fix/3_coverity
fix(query): fix syntax errors on centos.
2023-02-24 17:39:12 +08:00
cyang 21234a33dc fix:converity scan error 2023-02-24 17:02:30 +08:00
Xiaoyu Wang 961107d1ca merge main 2023-02-24 16:55:50 +08:00
Haojun Liao 6120c73aaa
Merge pull request #20122 from taosdata/enh/TD-22715
fix: fix distributed table error
2023-02-24 16:44:43 +08:00
wangmm0220 181d588f85 fix:core dump if data block size is 0 2023-02-24 16:04:35 +08:00
Hongze Cheng 2a8f7e121a Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/TD-22710 2023-02-24 14:41:42 +08:00
Hongze Cheng 765ff98f6a fix: compact wrong data count 2023-02-24 14:41:23 +08:00
Haojun Liao 80babb19f0 fix(query): fix syntax errors on centos. 2023-02-24 14:34:53 +08:00
Haojun Liao 993ae9e7e9 Merge branch '3.0' into fix/3_coverity 2023-02-24 14:34:01 +08:00
Haojun Liao 26ab5e011b fix(query): fix syntax errors on centos. 2023-02-24 14:05:52 +08:00
Xiaoyu Wang 58fc265b80 merge main 2023-02-24 13:26:45 +08:00
Haojun Liao 22aa03307c fix(query): fix syntax errors on centos. 2023-02-24 11:38:54 +08:00
Haojun Liao 645c3e672f
Merge pull request #20144 from taosdata/fix/3_coverity
fix(query): fix coverity issue.
2023-02-24 11:31:36 +08:00
Xiaoyu Wang d06dedd5cc
Merge pull request #20103 from taosdata/fix/TD-22668
fix: coverity scan issues
2023-02-24 10:53:49 +08:00
Haojun Liao 7821bbe0d0 refactor: add some logs. 2023-02-24 10:08:25 +08:00
Haojun Liao cc393f3939
Merge pull request #20143 from taosdata/feature/3_liaohj
refactor: do some internal refactor.
2023-02-24 09:58:44 +08:00
Haojun Liao 97024f1468 fix(query): fix coverity issue. 2023-02-24 09:48:34 +08:00
Haojun Liao bbb571a383 refactor: do some internal refactor. 2023-02-24 00:06:18 +08:00
Haojun Liao dbb1e9bd59 refactor: do some internal refactor. 2023-02-23 21:59:55 +08:00
yihaoDeng 2013ba0d8f fix: fix asan problem 2023-02-23 17:54:51 +08:00
54liuyao e42d5ba3dc fix:table name is null 2023-02-23 17:31:47 +08:00
Haojun Liao 6e39bec448
Merge pull request #20089 from taosdata/fix/TD-22671
fix:remove useless logic in tmq
2023-02-23 17:27:00 +08:00
Xiaoyu Wang 1ab144609e merge main 2023-02-23 14:58:22 +08:00
yihaoDeng 7d75939fae fix: fix invalid dist count 2023-02-23 14:35:05 +08:00
54liuyao 72e7f617e2 fix:disable stream 2023-02-23 14:24:45 +08:00
Haojun Liao c16bbfadbb
Merge pull request #20115 from taosdata/feature/3_liaohj
refactor: add some logs.
2023-02-23 11:23:48 +08:00
dapan1121 29f84355eb
Merge pull request #20107 from taosdata/fix/TD-22689
fix: taosd crash issue caused of out of fd
2023-02-23 10:48:21 +08:00
Xiaoyu Wang ebcd7415c1
Merge pull request #20086 from taosdata/fix/TD-22670
fix(tsdb/cache): use state's tsdb instead of readers
2023-02-23 10:39:26 +08:00
Xiaoyu Wang 7dc3c6b4e8
Merge pull request #20056 from taosdata/FIX/TD-22595-main
fix: synchronize access to pVnode->inUse
2023-02-23 10:39:00 +08:00
Haojun Liao b203107922
Merge branch 'main' into feature/3_liaohj 2023-02-23 10:22:17 +08:00
Haojun Liao 6015729560 refactor: add some logs. 2023-02-23 09:21:32 +08:00
Haojun Liao 4432ae51e6
Merge branch 'main' into fix/liaohj 2023-02-23 09:04:32 +08:00
Haojun Liao 5b1c2fc314
Merge pull request #20094 from taosdata/feature/3_liaohj
fix(tmq): update the epset when the leader of vnode changed.
2023-02-23 08:58:40 +08:00
dapan1121 532fb08309 fix: rsma invalid read issue 2023-02-22 18:13:24 +08:00
dapan1121 5a587d15f3 fix: taosd crash issue 2023-02-22 17:12:08 +08:00