Commit Graph

9289 Commits

Author SHA1 Message Date
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
Haojun Liao 82d98f9c97
Merge branch 'main' into feature/3_liaohj 2023-03-31 16:07:40 +08:00
Hongze Cheng 171d360cac
Revert "current from binary to json" 2023-03-31 15:25:00 +08:00
Haojun Liao b0fb912da8 fix(mnd): fix the invalid access of NULL ptr. 2023-03-31 11:48:52 +08:00
cademfly b24cf98ef3 use only one altertype for both table and cond 2023-03-31 11:03:33 +08:00
cademfly d85d1bf58e add new dup fun 2023-03-31 10:04:03 +08:00
cademfly 7342bde45d fake empty hash mark 2023-03-30 19:03:28 +08:00
cademfly db725c6f6d show priviledge format 2023-03-30 18:53:50 +08:00
cademfly 3ae4996458 remove all handle 2023-03-30 16:17:51 +08:00
cademfly 38b6bfd848 remove normal table priviledge 2023-03-30 16:10:34 +08:00
cademfly dbc75feac3 normal table 2023-03-30 15:56:08 +08:00
dapan1121 15578cf980
Merge branch 'main' into fix/cencVer 2023-03-30 15:36:30 +08:00
cademfly b528cb0561 fix dup hash 2023-03-30 15:13:09 +08:00
cademfly 824c87a6c7 binary format 2023-03-30 13:59:48 +08:00
Haojun Liao 5f4cb41e28 fix(tmq): set correct start offset value. 2023-03-29 23:45:41 +08:00
cademfly 8309718af1 condition 2023-03-29 19:51:49 +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
slzhou accebcedc4 Merge branch '3.0' of github.com:taosdata/TDengine into szhou/python-udf-improvement 2023-03-29 14:52:04 +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
Xiaoyu Wang 518a1e6ece
Merge pull request #20683 from taosdata/fix/main_bugfix_wxy
fix: hotfix version compatibility
2023-03-29 13:38:04 +08:00
cademfly 2fd10c2aa0 table 2023-03-29 13:30:32 +08:00
dapan1121 2714ce2af8 fix: rows count issue 2023-03-29 13:22:12 +08:00
Haojun Liao 10f08c948b
Merge pull request #20679 from taosdata/feature/3_liaohj
fix(query): allow only one trans to be execute for each balance, and do some other refactor.
2023-03-29 13:17:18 +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 4a085db970 fix: hotfix version compatibility 2023-03-29 11:10:15 +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 94c6af39da fix(tmq): fix the invalid free 2023-03-29 10:46:44 +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 70d0d7a63f fix(tmq): fix the syntax error. 2023-03-29 09:08:07 +08:00
Haojun Liao ceb160c23b fix(query): fix memory leak. 2023-03-28 23:14:11 +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
Haojun Liao b444e8db1a others: merge main. 2023-03-28 19:42:07 +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
Benguang Zhao 78ab9d3bf9 fix: process appendLog replies in vnode-sync thread 2023-03-28 17:57:08 +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
shenglian zhou b6542fb286 fix: add language and definition body to ins_functions 2023-03-28 08:43:34 +08:00
dapan1121 61571d9296 enh: optimize count performance 2023-03-27 19:40:29 +08:00
Xiaoyu Wang 6726bda9de
Merge pull request #20652 from taosdata/fix/wrong-field-logging
wrong field logging
2023-03-27 19:05:15 +08:00
Xiaoyu Wang 97855c6233
Merge pull request #20607 from taosdata/FEAT/TD-23257-3.0
feat: WAL cleanup not affected by topic consumption anymore
2023-03-27 17:58:31 +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
cadem 2495d0781d wrong field logging 2023-03-27 15:11:20 +08:00
Xiaoyu Wang af53a3a226
Merge pull request #20643 from taosdata/fix/main_bugfix_wxy
fix: enterprise version displays the associated community version gitinfo
2023-03-27 13:05:25 +08:00
Xiaoyu Wang ed48713a4b
Merge pull request #20615 from taosdata/fix/trigger-election-by-sync-msg
Fix/trigger election by sync msg
2023-03-27 11:54:53 +08:00
Xiaoyu Wang 5f9f5be6f4 fix: enterprise version displays the associated community version gitinfo 2023-03-27 11:06:10 +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
Benguang Zhao ffc3b7b27a enh: add the errorcode TSDB_CODE_MND_DB_RETENTION_PERIOD_ZERO 2023-03-25 11:06:05 +08:00
Xiaoyu Wang d2b8c5e433
Merge pull request #20524 from taosdata/fix/clusterid-isolation
fix: clusterid isolation
2023-03-25 09:19:49 +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
Benguang Zhao 22b904b711 feat: not allowed to create a topic when WAL_RETENTION_PERIOD is zero 2023-03-24 11:55:02 +08:00
Benguang Zhao 235ef431d2 feat: not allowed to set WAL_RETENTION_PERIOD as zero when there are topics defined 2023-03-24 11:47:23 +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
Shengliang Guan 8d1224ce22 refactor: format code 2023-03-23 22:31:20 +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
Xiaoyu Wang eb79046a70 merge 3.0 2023-03-22 11:42:02 +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
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
Xiaoyu Wang 58ebd3539d feat: alter database wal_retention_period/wal_retention_size 2023-03-21 16:45:19 +08:00
dapan1121 f97c4e7e35
Merge pull request #20557 from taosdata/fix/TS-2932-CM
fix: set grant cluster info
2023-03-21 16:25:21 +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 6fd4bc7e27 fix: set grant cluster info 2023-03-20 20:06:10 +08:00
kailixu aa4c1cb5eb chore: more code 2023-03-20 17:44:34 +08:00
kailixu 179579f204 chore: more code 2023-03-20 17:41:22 +08:00
kailixu 24dbcaa844 chore: merge main 2023-03-20 17:32:54 +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
dapan1121 189ff567e0
Merge pull request #20537 from taosdata/revert-20485-fix/TS-2891-M
Revert "fix(query): invalid write when query of ins_columns"
2023-03-19 19:58:13 +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
Cary Xu 7a3c897a80
Revert "fix(query): invalid write when query of ins_columns" 2023-03-18 20:49:48 +08:00
wangmm0220 ccba1d07c6 fix:error in TD-23218 & remove useless logic 2023-03-18 18:42:49 +08:00