816 commits

Author	SHA1	Message	Date
Liu Jicong	b0d935ba7d	merge from 3.0	2022-01-06 10:56:25 +08:00
Liu Jicong	df554c03fc	handle merge conflict	2022-01-06 10:44:34 +08:00
Liu Jicong	0ba5427a9b	handle subscribe	2022-01-06 10:28:34 +08:00
Shengliang Guan	ad1e992951	Merge pull request #9619 from taosdata/feature/dnode3 ... rename some variables	2022-01-05 20:29:30 +08:00
Shengliang Guan	ad94dff047	mionr changes	2022-01-05 04:18:56 -08:00
Haojun Liao	f65da854a5	Merge pull request #9613 from taosdata/feature/3.0_liaohj ... Feature/3.0 liaohj	2022-01-05 18:06:03 +08:00
Shengliang Guan	5ba5bc79d7	Merge pull request #9611 from taosdata/feature/dnode3 ... when an error occurs in rollback or retry, the failed result is returned first	2022-01-05 17:41:30 +08:00
Shengliang Guan	d32d44f14e	Merge pull request #9609 from taosdata/feature/qnode ... Feature/qnode	2022-01-05 17:41:20 +08:00
Shengliang Guan	92b6782d19	Merge remote-tracking branch 'origin/3.0' into feature/dnode3	2022-01-05 01:31:30 -08:00
Shengliang Guan	3bd4210765	When an error occurs in rollback or retry, the failed result is returned first	2022-01-05 01:31:13 -08:00
dapan1121	4728b159c7	feature/qnode	2022-01-05 16:00:06 +08:00
Haojun Liao	27224db24b	[td-11818] fix memory leak and refactor code.	2022-01-05 14:09:02 +08:00
Shengliang Guan	e4c3d8fb24	Merge pull request #9598 from taosdata/feature/index_complete ... Feature/index complete	2022-01-05 11:50:56 +08:00
Xiaoyu Wang	0d4490bce8	TD-12696 bug fix for insert	2022-01-04 22:32:38 -05:00
yihaoDeng	5567613976	merge develop	2022-01-05 10:54:08 +08:00
Shengliang Guan	507c0c0288	Merge pull request #9590 from taosdata/feature/dnode3 ... Feature/dnode3	2022-01-05 09:09:46 +08:00
yihaoDeng	a84af55702	refactor code	2022-01-04 23:24:37 +08:00
yihaoDeng	82745dea80	refactor code	2022-01-04 23:13:08 +08:00
Shengliang Guan	268c3343d5	minor changes	2022-01-04 04:42:03 -08:00
Shengliang Guan	821b9ea4d3	minor changes	2022-01-04 04:04:23 -08:00
Shengliang Guan	bcad6bb528	restore from wal	2022-01-04 03:44:44 -08:00
yihaoDeng	cee5a2ecbe	optimize tfile	2022-01-04 18:01:31 +08:00
Shengliang Guan	542e061d27	Merge pull request #9581 from taosdata/feature/3.0_liaohj ... [td-11818] refactor.	2022-01-04 16:48:46 +08:00
Haojun Liao	9328785043	[td-11818] refactor.	2022-01-04 16:21:32 +08:00
Haojun Liao	97fb365252	Merge pull request #9576 from taosdata/feature/3.0_liaohj ... Feature/3.0 liaohj	2022-01-04 15:34:20 +08:00
Haojun Liao	7128b3cdab	[td-11818] refactor.	2022-01-04 15:20:16 +08:00
Haojun Liao	09fe692b85	[td-11818] refactor log/fix bug in create child table.	2022-01-04 15:17:17 +08:00
Haojun Liao	9b312e90a0	Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj	2022-01-04 14:01:44 +08:00
Shengliang Guan	41c08c54ff	Merge remote-tracking branch 'origin/3.0' into feature/dnode3	2022-01-03 21:50:49 -08:00
Shengliang Guan	3bad4a2ef2	Merge branch 'feature/dnode3' of https://github.com/taosdata/TDengine into feature/dnode3	2022-01-04 13:41:32 +08:00
Shengliang Guan	e2a6d3e120	Merge pull request #9572 from taosdata/feature/dnode3 ... Feature/dnode3	2022-01-04 13:39:48 +08:00
Shengliang Guan	9633a2b246	Merge remote-tracking branch 'origin/3.0' into feature/dnode3	2022-01-03 21:34:04 -08:00
dapan1121	adc828d2f9	Merge branch '3.0' into feature/qnode	2022-01-04 13:23:53 +08:00
Haojun Liao	28480de785	[td-11818]fix compiler error.	2022-01-04 13:15:23 +08:00
Haojun Liao	d862dcae83	[td-11818] refactor, fix bug in repeat create table, add request id for each query.	2022-01-04 12:58:39 +08:00
dapan1121	c1bbea8caf	Merge remote-tracking branch 'origin/3.0' into feature/qnode	2022-01-04 11:27:32 +08:00
Shengliang Guan	efb3d812b1	add commit version to sdb	2022-01-04 11:23:54 +08:00
dapan1121	1dba25656a	feature/qnode	2022-01-04 11:15:00 +08:00
Liu Jicong	8938c902de	merge from 3.0	2022-01-04 10:46:49 +08:00
Liu Jicong	0a83ecac81	add sub structure	2022-01-04 10:40:34 +08:00
Haojun Liao	144358f0df	Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj	2022-01-04 10:12:06 +08:00
Shengliang Guan	5ac3398f3a	Mnode intergate with wal module	2022-01-03 21:36:31 +08:00
Hongze Cheng	687cf9a732	Merge branch '3.0' of github.com:taosdata/TDengine into feature/vnode	2022-01-03 18:11:01 +08:00
Shengliang Guan	3efe621526	integration with wal module	2022-01-03 17:44:47 +08:00
Hongze Cheng	086a2202ce	more	2022-01-03 08:45:31 +00:00
Hongze Cheng	7b3a04c4dd	more	2022-01-03 06:34:54 +00:00
Hongze Cheng	ad33744771	Fix variant encoding bug	2022-01-03 06:15:52 +00:00
Haojun Liao	5326356375	[td-11818] create multiple tables.	2022-01-02 23:24:22 +08:00
Hongze Cheng	eaca069a45	more	2022-01-02 10:34:31 +00:00
Hongze Cheng	729aabca15	refact	2022-01-02 10:29:47 +00:00