Skip to content

merge: from main to 3.0 branch #33254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guanshengliang merged 42 commits into from
Oct 16, 2025
Merged

merge: from main to 3.0 branch #33254

Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
1bffc0e
fix: conditionally copy scripts and update configuration instructions…
tomchon Oct 9, 2025
eae87e2
enh: optimize stable event window plan (#33195)
dapan1121 Oct 10, 2025
50bbed3
refactor: if statement
feici02 Oct 10, 2025
c052fa4
Merge pull request #33188 from taosdata/fix/install-lite
feici02 Oct 10, 2025
85d1b7c
fix: TD-38212 (#33186)
cadem Oct 10, 2025
f599951
fix: fix tdgpt timemoe model directory
SallyHuo-TAOS Oct 11, 2025
d3b8ea0
docs: update release note for 3.3.8.1 in office web (#33216)
feici02 Oct 11, 2025
aa98fb8
fix: type conversion error (#32844)
menshibin Oct 11, 2025
9f9987d
feat: complete version number character copying (#33206)
menshibin Oct 11, 2025
d0d4fde
docs: update python ws version history (#33222)
qevolg Oct 13, 2025
0b4e9dd
Update packaging/docker/entrypoint.sh
SallyHuo-TAOS Oct 13, 2025
3d38933
Merge pull request #33213 from taosdata/fix/huoh/timemoe_model_directory
feici02 Oct 13, 2025
a7e3f9b
enh(last): enable reading cache when select last and tags (#33204)
Tony2h Oct 13, 2025
d54b04d
enh: TD-38163-mnode-open-log (#33160)
guanshengliang Oct 13, 2025
da00480
fix: clearing user_ip in taos_options_connection does not take effect…
yihaoDeng Oct 13, 2025
b375653
fix: clearing user_ip in taos_options_connection does not take effect…
yihaoDeng Oct 13, 2025
348907e
enh: rsma docs and task monitor (#33219)
kailixu Oct 13, 2025
62222bb
feat: unique getBuildPath invoke and ignore .git branch name contain …
SallyHuo-TAOS Oct 13, 2025
f505eab
feat: unique getBuildPath invoke and ignore .git branch name contain …
SallyHuo-TAOS Oct 13, 2025
4f4f946
Update test_oldcase_taosdShell.py
SallyHuo-TAOS Oct 13, 2025
dffa8e6
Merge branch '3.3.6' into merge/3.3.6tomain
guanshengliang Oct 13, 2025
8711689
fix: TS-7219-handle-status-req-timeout (#33210)
cadem Oct 13, 2025
b1f6208
Merge branch '3.3.6' into merge/3.3.6tomain
guanshengliang Oct 13, 2025
a8935e8
merge: from 3.3.6 to main branch #33235
guanshengliang Oct 14, 2025
6fbe34e
Merge branch 'main' into merge/mainto3.0
guanshengliang Oct 14, 2025
f00e71c
Update test_subscribeStb3.py
SallyHuo-TAOS Oct 14, 2025
8cdcb62
Refactor test_subscribeDb0.py for clarity
SallyHuo-TAOS Oct 14, 2025
cb0e21b
Update test_compatibility_cross_version.py
SallyHuo-TAOS Oct 14, 2025
06a358d
fix: get stream tasks list crash issue (#33238)
dapan1121 Oct 14, 2025
98b6d11
Merge pull request #33233 from taosdata/feat/huoh/TD-33281
feici02 Oct 14, 2025
34b3e08
enh: TD-38278-print-error-code (#33231)
cadem Oct 14, 2025
f168881
enh(last): enable using cache when select last and composite key (#33…
Tony2h Oct 14, 2025
1ac2412
Fix/test case/err desc main (#33246)
facetosea Oct 14, 2025
0dc3023
enh: add and apply trigger latency config (#33245)
dapan1121 Oct 14, 2025
80d6713
fix(stream): fix memory leak in vtable data merge (#33194)
JinqingKuang Oct 14, 2025
648a6d4
enh(last): enable reading cache when select last and tags (#33236)
Tony2h Oct 14, 2025
3b36c91
Merge branch 'main' into merge/mainto3.0
guanshengliang Oct 14, 2025
6bc92e1
Merge branch '3.3.6' into merge/3.3.6tomain
Tony2h Oct 14, 2025
01668ff
docs: add error codes Prefix Categories (#33250)
DuanKuanJun Oct 14, 2025
e9d53dd
merge: from 3.3.6 to main #33255
guanshengliang Oct 15, 2025
892e1ac
fix: TD-37490 ci case (#33187)
facetosea Oct 15, 2025
22e93ba
Merge branch 'main' into merge/mainto3.0
guanshengliang Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update packaging/docker/entrypoint.sh 
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
  • Loading branch information
@SallyHuo-TAOS @gemini-code-assist
SallyHuo-TAOS and gemini-code-assist[bot] authored Oct 13, 2025
commit 0b4e9dd20df3f2f147295cd4cea6275d5486e592
2 changes: 1 addition & 1 deletion packaging/docker/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ else
execute_startup "${MODEL_BASE_PATH}/tdtsfm" "tdtsfm" "${MODEL_NAMES['tdtsfm']}"
fi
if [ -f ${TIMEMOE_FLAG_FILE} ];then
echo "Starting timermoe server..."
echo "Starting timemoe server..."
execute_startup "${MODEL_BASE_PATH}/timemoe" "timemoe" "${MODEL_NAMES['timemoe']}"
fi
fi
Expand Down