Commit Graph

11287 Commits

Author SHA1 Message Date
Minglei Jin a4cfb51b99 tsdbReaderWriter: fix windows compiling issue 2022-07-04 17:03:53 +08:00
Minglei Jin 244dcbed5d Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-07-04 16:58:59 +08:00
Minglei Jin 9aa5ee6ccf tsdbCache: fix row duplication 2022-07-04 16:58:42 +08:00
Hongze Cheng de60ec37b6 fix CI bug 2022-07-04 08:26:16 +00:00
Hongze Cheng 40d34bf894 fix a bug 2022-07-04 07:01:54 +00:00
Minglei Jin 8d00f1139a tsdbRead: fix None display to NULL instead of 0 2022-07-04 14:46:00 +08:00
Haojun Liao 16d18b8046 refactor: do some internal refactor. 2022-07-04 14:10:29 +08:00
Hongze Cheng 267e450a15 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-07-04 05:21:43 +00:00
Hongze Cheng af1b6f997f Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-07-04 05:21:08 +00:00
Hongze Cheng 38ca993452 make merge compile 2022-07-04 05:21:02 +00:00
Minglei Jin 1e479bd5bb Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-07-04 12:00:23 +08:00
Xiaoyu Wang f29a735081 fix: compile error 2022-07-04 11:50:55 +08:00
Minglei Jin a1da4ebb0b Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-07-04 11:45:19 +08:00
Minglei Jin 253291a146 tsdbCache: destroy del index array 2022-07-04 11:43:23 +08:00
Hongze Cheng ddb198de23 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-07-04 03:42:50 +00:00
Hongze Cheng 169a66642d Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-07-04 03:01:24 +00:00
Hongze Cheng b1466ad79c make sma work 2022-07-04 03:01:19 +00:00
Minglei Jin f34e43d7b8 tsdbCache: new clearNextRowFS to cleanup fs iter 2022-07-04 11:00:11 +08:00
yihaoDeng e08353f843 Merge branch 'dlp' into idx 2022-07-04 09:28:26 +08:00
Cary Xu a9161a5c7b
Merge pull request #14471 from taosdata/feature/TD-11274-3.0
refactor: rsma commit and recovery
2022-07-03 23:44:06 +08:00
Yihao Deng a565d6274a
Merge pull request #14478 from taosdata/fix/rpcInvalidRead
fix: rpc invalid read
2022-07-03 23:04:11 +08:00
Haojun Liao a7cbb93a38 refactor: do some internal refactor. 2022-07-03 23:00:12 +08:00
Cary Xu daaf9d90f2 fix: no iterate hash if has no elements 2022-07-03 22:51:56 +08:00
Cary Xu e926b914d1 Merge branch '3.0' into feature/TD-11274-3.0 2022-07-03 20:39:13 +08:00
Cary Xu c41364d5cd refactor: rsma commit and recovery 2022-07-03 20:38:54 +08:00
yihaoDeng fcf6894144 fix invalid read/write 2022-07-03 15:06:44 +08:00
Yihao Deng 87f28ab358
Revert "fix: avoid invalid read" 2022-07-03 15:01:44 +08:00
Yihao Deng b09791d4af
Merge pull request #14476 from taosdata/fix/rpcInvalidRead
fix: avoid invalid read
2022-07-03 15:01:39 +08:00
yihaoDeng d493fbed98 fix invalid read/write 2022-07-03 11:54:19 +08:00
Haojun Liao ba8ab92632 refactor: do some internal refactor. 2022-07-02 23:37:31 +08:00
Shengliang Guan 361ff046a5
Merge pull request #14465 from taosdata/fix/tsim
refactor: temporarily comment out some code and use cases
2022-07-02 21:25:53 +08:00
Haojun Liao 42d635a73d refactor: do some internal refactor. 2022-07-02 20:39:23 +08:00
Liu Jicong 31bbef82d1 fix(tmq): seek snapshot offset 2022-07-02 20:18:40 +08:00
Shengliang Guan 0a1299c8d0 fix: show indexes 2022-07-02 19:23:07 +08:00
Shengliang Guan d28c97ba5a Merge remote-tracking branch 'origin/fix/dnode_wxy' into fix/tsim 2022-07-02 19:16:31 +08:00
Xiaoyu Wang dd564e551c fix: a problem of show indexes 2022-07-02 19:16:03 +08:00
Xiaoyu Wang ae0e956837 Merge remote-tracking branch 'origin/fix/dnode' into fix/dnode_wxy 2022-07-02 19:01:36 +08:00
Xiaoyu Wang c08b3c9313 fix: a problem of show indexes 2022-07-02 19:01:16 +08:00
Cary Xu 5b1f3dc5ab enh: revert the gForceCommit 2022-07-02 18:59:02 +08:00
Cary Xu 8b8d454eb5 Merge branch '3.0' into feature/TD-11274-3.0 2022-07-02 18:52:33 +08:00
Cary Xu 0e9a22ffc8 refactor: rsma commit and recovery 2022-07-02 18:52:15 +08:00
Shengliang Guan a08945df13 Merge remote-tracking branch 'origin/3.0' into fix/tsim 2022-07-02 18:51:07 +08:00
Shengliang Guan a6221e654a fix: show indexes 2022-07-02 18:45:07 +08:00
Xiaoyu Wang d42895d581 fix: a problem of show indexes 2022-07-02 18:34:00 +08:00
Hongze Cheng 529394a011 more work 2022-07-02 10:04:51 +00:00
Shengliang Guan f2e1a3149c fxi: show indexes 2022-07-02 18:02:58 +08:00
Zhiqiang Wang b45702be6f
Merge pull request #14466 from taosdata/fix/ZhiqiangWang/TD-13064-add-Mac-compile-support
os: add Mac compile support
2022-07-02 18:02:28 +08:00
WANG MINGMING e4a711975d
Merge pull request #14458 from taosdata/feature/TD-13041
fix: erro in json in operator
2022-07-02 17:52:43 +08:00
Hongze Cheng 62519ae4bd more work 2022-07-02 09:52:21 +00:00
afwerar b9a1c6744c os: add Mac compile support 2022-07-02 17:40:23 +08:00