Commit Graph

25189 Commits

Author SHA1 Message Date
Minglei Jin 33967b243b
Merge branch '3.0' into fix/TD-25010-3 2023-08-10 12:14:01 +08:00
Haojun Liao b658608541
Merge pull request #22388 from taosdata/fix/3_liaohj
other: merge main.
2023-08-10 11:43:02 +08:00
kailixu 1ce8d06032 fix: proj col compare func 2023-08-10 09:57:57 +08:00
Haojun Liao c10b323188 other: merge main. 2023-08-10 09:26:33 +08:00
Minglei Jin ca5571d0d6 config: fix default configs 2023-08-10 08:29:51 +08:00
Haojun Liao 4393375e47 fix(stream): set correct task id. 2023-08-10 02:16:04 +08:00
Haojun Liao 0757e88ced fix(stream): set the correct hash keys. 2023-08-09 23:52:14 +08:00
Haojun Liao 0cf8144952 fix(stream): fix the invalid key used by remove data in stream meta hash table. 2023-08-09 22:28:23 +08:00
kailixu d6ed5fe096 fix: timezone and qsort for windows 2023-08-09 20:08:19 +08:00
Haojun Liao 7e3f1d92fc Merge branch 'main' into fix/liaohj 2023-08-09 19:43:24 +08:00
Hui Li 10f5d223bb
Merge pull request #22370 from taosdata/FIX/TD-25605-3.0
enh: check if disk space sufficient at primary dir with tfs
2023-08-09 18:32:07 +08:00
Minglei Jin a853d9d40c mxml: use ~/local/include 2023-08-09 18:21:55 +08:00
Haojun Liao 1e8579e8c5 fix(stream): fix other cases. 2023-08-09 16:04:48 +08:00
Haojun Liao 4c92997328 fix(stream): use streamId&taskId to identify the stream task in the stream meta. 2023-08-09 15:52:23 +08:00
Haojun Liao 1d649bccb6
Merge pull request #22372 from taosdata/fix/TD-25626
fix taosd cannot quit
2023-08-09 15:46:14 +08:00
Hui Li 584427dd44
Merge pull request #22374 from taosdata/szhou/restore-minglei-main
fix: restore stt/block merge back
2023-08-09 14:40:03 +08:00
Minglei Jin b08d5b4d42 mxml: add include dir to vnode 2023-08-09 14:02:10 +08:00
Minglei Jin 7e2859ed43 apr: use tarball to avoid ./buildconf 2023-08-09 13:03:37 +08:00
Haojun Liao 3cdb16352c fix(stream): avoid launching check downstream when failed to add stream task into stream meta. 2023-08-09 12:03:14 +08:00
Minglei Jin 2e0519b960 apr: fix apr & apr-util project names 2023-08-09 11:01:42 +08:00
Minglei Jin 7114ad63e5 apr:makefile for apr & apr-util 2023-08-09 10:54:17 +08:00
Minglei Jin 4d1155a5cf curl: makefile for curl 2023-08-09 10:43:27 +08:00
shenglian zhou e9e06d1eae fix: restore stt block/data block merge back 2023-08-09 10:36:54 +08:00
shenglian zhou 2b1478f46e Revert "fix(tsdb/read2): reset stt reader when suspended"
This reverts commit 079d7ff69e.
2023-08-09 10:36:26 +08:00
yihaoDeng 50bf8c948a change default session val 2023-08-09 02:11:27 +00:00
Minglei Jin 16e015253b s3/mxml: remove os external dependency 2023-08-09 10:10:25 +08:00
Haojun Liao bb39d94f9c
Merge pull request #22357 from taosdata/fix/liaohj
other: merge fix from 3.0 to main.
2023-08-09 09:05:54 +08:00
dapan1121 e54a4d5a58
Merge pull request #22206 from taosdata/szhou/ts-3706
enhance: subquery can use expr  primary key +/- value as primary key
2023-08-09 08:48:54 +08:00
dapan1121 5c918006b3
Merge pull request #22362 from taosdata/szhou/fix-ts3795
fix: reset rowsize since it is set during blockDataAppendColInfo
2023-08-09 08:46:34 +08:00
yihaoDeng cfb5247e30 change var name 2023-08-09 00:46:18 +00:00
dapan1121 aef0398c27
Merge pull request #22342 from taosdata/fix/TD-25426-3.0
fix: mktime on windows platform
2023-08-08 18:59:33 +08:00
Hui Li 8d7e8f5734
Merge pull request #22336 from taosdata/fix/TD-25445
fix/TD-25445: alter ttlChangeOnWrite note info
2023-08-08 18:19:02 +08:00
yihaoDeng bcc7df2dda fix taosd cannot quit 2023-08-08 10:04:41 +00:00
Benguang Zhao e4d16e594c enh: check if disk space sufficient at primary dir with tfs 2023-08-08 17:53:11 +08:00
Haojun Liao db92546cf7 fix(stream): remove invalid filter. 2023-08-08 16:09:33 +08:00
Haojun Liao 17c6143471 fix(stream): check more status when handling the state transfer. 2023-08-08 15:08:11 +08:00
Hongze Cheng c8f106106a fix: update assert issue 2023-08-08 14:49:05 +08:00
slzhou dff1f4954f Merge branch '3.0' of github.com:taosdata/TDengine into szhou/ts-3706 2023-08-08 13:28:17 +08:00
slzhou 9b4bdd819b enhance: subquery can use expr primary key +/- value as primary key 2023-08-08 13:24:06 +08:00
slzhou ff36f5f6ca fix: reset rowsize since it is set during blockDataAppendColInfo 2023-08-08 13:23:35 +08:00
Hui Li 4f03ae2c65
Merge pull request #22335 from taosdata/temp/open_case
open split vgroup case
2023-08-08 11:49:28 +08:00
dapan1121 68e0fb924a
Merge pull request #22165 from taosdata/feat/3.0/TD-25271
feature: optimize interval with limit
2023-08-08 10:34:02 +08:00
Haojun Liao db8ce3de3b other: merge main. 2023-08-08 10:17:51 +08:00
Haojun Liao 327e13c3f7 fix(stream): fix the syntax error. 2023-08-08 10:07:28 +08:00
Haojun Liao d6d63ec54c fix(stream): add more check. 2023-08-08 09:54:49 +08:00
Haojun Liao e89d3c18d6 fix(stream): remove invalid check. 2023-08-08 09:54:46 +08:00
Haojun Liao ac00e1d520 fix(stream): fetch all data before paused and dump to sink node. 2023-08-08 09:54:43 +08:00
Haojun Liao 0e3fd5277d fix(stream): dump results to sink node before paused. 2023-08-08 09:54:39 +08:00
Haojun Liao 1e680d4df1 fix(stream): ignore the sink task transfer state. 2023-08-08 09:52:19 +08:00
Haojun Liao 3bcc7ed83e fix(stream): transfer the state for agg tasks. 2023-08-08 09:52:04 +08:00