Commit Graph

54175 Commits

Author SHA1 Message Date
Shungang Li a39a9428af fix: ttlMgrDeleteTtl should ignore ttl 0 tables 2023-07-13 17:43:32 +08:00
kailixu 6ee135cb52 chore: more code 2023-07-13 17:37:31 +08:00
kailixu 67461d92a7 chore: merge 3.0 and solve conflict 2023-07-13 17:35:55 +08:00
liuyao d8b8112dbe op ci 2023-07-13 17:29:30 +08:00
Haojun Liao f4249234ef
Merge pull request #22057 from taosdata/enh/TD-25197-3.0
chore: make jenkins happy
2023-07-13 17:18:48 +08:00
liuyao b9d274d893 op ci 2023-07-13 17:16:48 +08:00
liuyao d6bb19485a mem leak 2023-07-13 16:53:07 +08:00
kailixu 0cc7dca3e3 chore: comment sysInfo to make CI pass 2023-07-13 16:49:55 +08:00
wade zhang 18aad0457b
Merge pull request #22030 from taosdata/docs/3.0/TS-3557
docs(driver): java seek desc
2023-07-13 16:38:23 +08:00
Haojun Liao 2fd72500e2 Merge remote-tracking branch 'origin/enh/triggerCheckPoint2' into enh/triggerCheckPoint2 2023-07-13 16:32:37 +08:00
Haojun Liao 813f4cb363 refactor: do some internal refactor. 2023-07-13 16:32:25 +08:00
liuyao ec2134f758 op ci 2023-07-13 16:24:38 +08:00
yihaoDeng 9e128b92f8 fix recover error 2023-07-13 16:17:18 +08:00
yihaoDeng 1307776786 fix recover error 2023-07-13 16:09:34 +08:00
yihaoDeng 9434b4eaac fix recover error 2023-07-13 16:07:58 +08:00
yihaoDeng 2361048bed Merge branch 'enh/triggerCheckPoint2' of https://github.com/taosdata/TDengine into enh/triggerCheckPoint2 2023-07-13 16:06:35 +08:00
yihaoDeng 18f9882834 fix recover error 2023-07-13 16:06:23 +08:00
kailixu 144cbd1e3b chore: make jenkins happy 2023-07-13 15:25:15 +08:00
huolibo ef529628e4 docs(driver): kafka connector add tmq 2023-07-13 14:14:02 +08:00
wade zhang ec86a68b6f
Merge pull request #22045 from taosdata/FEAT/TS-2699-3.0
enh: unify handling of vnode primary dir for vnd, tsdb and sma
2023-07-13 13:55:46 +08:00
Benguang Zhao dc75f7ce21 enh: use VNODE_RSMA_DIR in tdRSmaGetCurrentFName 2023-07-13 11:27:31 +08:00
liuyao 20235fb953 set ck id 2023-07-13 11:20:18 +08:00
Haojun Liao f41bcd73b0 other: merge main. 2023-07-13 11:02:09 +08:00
yihaoDeng b7403cd171 Merge branch 'enh/triggerCheckPoint2' of https://github.com/taosdata/TDengine into enh/triggerCheckPoint2 2023-07-13 10:38:34 +08:00
yihaoDeng 0e1a91d134 fix compile error 2023-07-13 10:38:21 +08:00
Benguang Zhao e209b487c6 enh: rename func name vnodeGetPrimaryDir 2023-07-13 10:38:05 +08:00
Haojun Liao af7f78ada2 Merge remote-tracking branch 'origin/enh/triggerCheckPoint2' into enh/triggerCheckPoint2 2023-07-13 10:17:10 +08:00
Haojun Liao 2f90a53548 fix(stream): set checkpoint id when expanding task. 2023-07-13 10:16:57 +08:00
yihaoDeng f3f3893872 fix compile error 2023-07-13 10:05:29 +08:00
yihaoDeng 2ec67bcc08 rm expire checkpoint 2023-07-13 10:00:16 +08:00
dapan1121 c5e41bffea
Merge pull request #22051 from taosdata/fix/TD-25197-M
fix: skip primary key for block sma
2023-07-13 09:55:29 +08:00
dapan1121 424c3d39fb
Merge pull request #22048 from taosdata/feat/TD-25003
feat: add new syntax for show tags/index/table tags
2023-07-13 09:46:11 +08:00
Haojun Liao 773ae39d33 Merge remote-tracking branch 'origin/enh/triggerCheckPoint2' into enh/triggerCheckPoint2
# Conflicts:
#	source/libs/stream/src/streamCheckpoint.c
2023-07-13 09:17:51 +08:00
Haojun Liao 08a4fb06ae fix(stream): dispatch checkpoint msg to downstream by puting message into input queue. 2023-07-13 09:17:20 +08:00
kailixu 466f1037b4 Merge branch '3.0' into enh/TD-23769-3.0 2023-07-12 18:50:16 +08:00
Haojun Liao c388802bda
Merge pull request #22024 from taosdata/fix/3_liaohj
fix(stream): fix concurrent bug in save task meta.
2023-07-12 18:17:27 +08:00
kailixu 8f58f9aa5b fix: skip primary key for block sma 2023-07-12 18:07:01 +08:00
Benguang Zhao b7e134af20 enh: remove unused code in vmProcessCreateVnodeReq 2023-07-12 17:58:30 +08:00
Benguang Zhao 05e8af4837 enh: unify handling of vnode primary dir for vnd and tsdb 2023-07-12 17:58:18 +08:00
Benguang Zhao 4c3bf41178 enh: unify handling of vnode primary dir for sma 2023-07-12 17:56:21 +08:00
Benguang Zhao bbf58d2d9d enh: unify handling of vnode primary dir in vnodeCreate and metaOpen 2023-07-12 17:56:21 +08:00
wade zhang 6a3e702ff4
Merge pull request #22049 from taosdata/docs/sunpeng/update-python-doc-catalog
docs: update python doc catalog
2023-07-12 17:34:25 +08:00
wade zhang 6d679070ef
Merge pull request #22050 from taosdata/docs/sunpeng/update-python-doc-catalog-for-3.0
docs: update python doc catalog
2023-07-12 17:34:09 +08:00
sunpeng 82fdc35a25 docs: update python doc catalog 2023-07-12 17:27:33 +08:00
sunpeng ed0c72bd45 docs: update python doc catalog 2023-07-12 17:24:03 +08:00
yihaoDeng 82468f162a Merge branch 'enh/triggerCheckPoint2' of https://github.com/taosdata/TDengine into enh/triggerCheckPoint2 2023-07-12 16:43:56 +08:00
yihaoDeng e1de4984a6 Merge branch 'enh/triggerCheckPoint2' of https://github.com/taosdata/TDengine into enh/triggerCheckPoint2 2023-07-12 16:39:19 +08:00
yihaoDeng bb72f07a94 rm expire checkpoint 2023-07-12 16:38:46 +08:00
dapan1121 83dbc9be6c
Merge pull request #22043 from taosdata/fix/TD-25169
fix: report permission error when all columns are invisiable
2023-07-12 16:27:37 +08:00
dapan1121 c3f0ea675c
Merge pull request #22042 from taosdata/fix/TD-25168
fix: set ins_snodes to be sysinfo
2023-07-12 16:27:09 +08:00