672 commits

Author	SHA1	Message	Date
Hongze Cheng	d083bcb7e9	refact	2022-01-07 02:12:06 +00:00
Hongze Cheng	84c2ed27b3	more	2022-01-07 02:09:47 +00:00
Hongze Cheng	b1351da7cd	refact	2022-01-07 02:05:51 +00:00
Hongze Cheng	9241af2298	tsdb integration	2022-01-07 01:54:05 +00:00
Hongze Cheng	e818e4aa5b	more integration	2022-01-06 10:29:48 +00:00
Hongze Cheng	ae426947d3	more integration	2022-01-06 10:11:28 +00:00
Hongze Cheng	0cffefc835	Merge branch '3.0' into feature/vnode	2022-01-06 09:40:04 +00:00
Hongze Cheng	4cc10cfaef	more	2022-01-06 09:09:24 +00:00
Hongze Cheng	3a2975f157	more	2022-01-06 08:47:26 +00:00
Hongze Cheng	cb96d68596	add 2.0 tsdb	2022-01-06 08:43:09 +00:00
Hongze Cheng	96f2aea215	Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode	2022-01-06 14:49:21 +08:00
Hongze Cheng	5c66e5f2c2	more work	2022-01-06 06:34:20 +00:00
Shengliang Guan	41d8c7a612	minor changes	2022-01-05 21:20:20 -08:00
Shengliang Guan	d2238d38d4	Merge remote-tracking branch 'origin/3.0' into feature/dnode3	2022-01-05 20:22:36 -08:00
Shengliang Guan	db2dbe5f51	pullup trans when mnode restart	2022-01-05 20:22:33 -08:00
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	3c3f32bdae	minor changes	2022-01-05 05:17:16 -08:00
Shengliang Guan	ad94dff047	mionr changes	2022-01-05 04:18:56 -08:00
Shengliang Guan	11d6b02aa4	minor changes	2022-01-05 02:35:34 -08:00
Hongze Cheng	14ee6732d1	Merge branch '3.0' of github.com:taosdata/TDengine into feature/vnode	2022-01-05 18:23:43 +08:00
Shengliang Guan	9e3a6804a9	add show test	2022-01-05 02:20:59 -08:00
Hongze Cheng	381cd7e4d7	refact	2022-01-05 10:20:34 +00:00
Shengliang Guan	fdca2ec4bf	minor changes	2022-01-05 02:18:47 -08:00
Shengliang Guan	69349c38d4	fix gtest errors	2022-01-05 02:08:56 -08:00
Hongze Cheng	0db40add06	fix insert bug	2022-01-05 10:07:41 +00:00
Hongze Cheng	c7eab2a177	make insert ts to mem work	2022-01-05 09:51:00 +00: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
Hongze Cheng	e9db1ee7c6	more progress	2022-01-05 09:14:20 +00:00
Hongze Cheng	269fe312ec	make compile	2022-01-05 07:26:49 +00:00
Shengliang Guan	9dd5922d15	error returned when trans rollback	2022-01-04 22:36:24 -08:00
Hongze Cheng	69edf751fc	more	2022-01-05 05:50:45 +00:00
Shengliang Guan	ad965dbcb4	invalid release	2022-01-04 19:25:58 -08:00
Hongze Cheng	c9eacf95c5	Merge branch '3.0' of github.com:taosdata/TDengine into feature/vnode	2022-01-05 10:31:16 +08:00
Shengliang Guan	b697bf9aaf	Merge pull request #9595 from taosdata/feature/dnode3 ... fix crash while process transmsg	2022-01-05 10:30:33 +08:00
Shengliang Guan	6ae9a421e0	fix crash while process transmsg	2022-01-04 18:27:11 -08:00
Hongze Cheng	75077c4ae9	make multi-thread query work	2022-01-05 02:12:50 +00:00
Shengliang Guan	c0aded7b57	add test cases	2022-01-04 17:58:02 -08:00
Shengliang Guan	507c0c0288	Merge pull request #9590 from taosdata/feature/dnode3 ... Feature/dnode3	2022-01-05 09:09:46 +08:00
Shengliang Guan	c5decfec28	test for dqnode	2022-01-04 05:31:49 -08:00
Shengliang Guan	268c3343d5	minor changes	2022-01-04 04:42:03 -08:00
Shengliang Guan	7974143dc7	minor changes	2022-01-04 04:36:54 -08:00
Shengliang Guan	dfd724a81c	minor changes	2022-01-04 04:19:06 -08:00
Shengliang Guan	0526051edd	minor changes	2022-01-04 04:18:09 -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
Shengliang Guan	5f70d7b241	minor changes	2022-01-04 01:39:48 -08:00
Shengliang Guan	e0b59648a3	Merge pull request #9585 from taosdata/feature/dnode3 ... test cases for trans	2022-01-04 17:37:35 +08:00