diff --git a/.github/workflows/taosd-ci-build.yml b/.github/workflows/taosd-ci-build.yml
index 0f65684027..2179200bb3 100644
--- a/.github/workflows/taosd-ci-build.yml
+++ b/.github/workflows/taosd-ci-build.yml
@@ -6,6 +6,7 @@ on:
- 'main'
- '3.0'
- '3.1'
+ - '3.3.6'
- 'enh/cmake-TD-33848'
paths-ignore:
diff --git a/.github/workflows/taosd-ci.yml b/.github/workflows/taosd-ci.yml
index 7ce0a5ce48..23c0e47ebb 100644
--- a/.github/workflows/taosd-ci.yml
+++ b/.github/workflows/taosd-ci.yml
@@ -9,17 +9,12 @@ on:
paths-ignore:
- 'packaging/**'
- 'docs/**'
- repository_dispatch:
- types: [trigger-tests-from-tdinternal]
concurrency:
- group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.event.client_payload.ref}}-${{ github.event_name == 'repository_dispatch' && 'dispatch' || ''}}
+ group: ${{ github.workflow }}-${{ github.ref }}-TDengine
cancel-in-progress: true
env:
- CONTAINER_NAME: 'taosd-test'
- WKDIR: '/var/lib/jenkins/workspace'
- WK: '/var/lib/jenkins/workspace/TDinternal'
WKC: '/var/lib/jenkins/workspace/TDinternal/community'
jobs:
@@ -28,439 +23,82 @@ jobs:
group: CI
labels: [self-hosted, Linux, X64, testing]
outputs:
- tdinternal: ${{ steps.parameters.outputs.tdinternal }}
run_function_test: ${{ steps.parameters.outputs.run_function_test }}
run_tdgpt_test: ${{ steps.parameters.outputs.run_tdgpt_test }}
- source_branch: ${{ steps.parameters.outputs.source_branch }}
- target_branch: ${{ steps.parameters.outputs.target_branch }}
- pr_number: ${{ steps.parameters.outputs.pr_number }}
steps:
- name: Determine trigger source and fetch parameters
id: parameters
run: |
set -euo pipefail
- # check the trigger source and get branch information
- if [ "${{ github.event_name }}" == "repository_dispatch" ]; then
- tdinternal="true"
- source_branch=${{ github.event.client_payload.tdinternal_source_branch }}
- target_branch=${{ github.event.client_payload.tdinternal_target_branch }}
- pr_number=${{ github.event.client_payload.tdinternal_pr_number }}
- run_tdgpt_test="true"
- run_function_test="true"
- else
- tdinternal="false"
- source_branch=${{ github.event.pull_request.head.ref }}
- target_branch=${{ github.event.pull_request.base.ref }}
- pr_number=${{ github.event.pull_request.number }}
+ # target_branch=${{ github.event.pull_request.base.ref }}
- # check whether to run tdgpt test cases
- cd ${{ env.WKC }}
- changed_files_non_doc=$(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD $target_branch) | grep -v "^docs/en/" | grep -v "^docs/zh/" | grep -v ".md$" | tr '\n' ' ' || :)
- echo “changed files exclude doc, ${changed_files_non_doc}"
- if [[ -n "$changed_files_non_doc" && "$changed_files_non_doc" =~ (forecastoperator\.c|anomalywindowoperator\.c|tanalytics\.h|tanalytics\.c|tdgpt_cases\.task|analytics|tdgpt) ]]; then
- run_tdgpt_test="true"
- else
- run_tdgpt_test="false"
- fi
- echo "run tdgpt test: ${run_tdgpt_test}"
+ # # Fetch the latest code from the target branch
+ # cd ${{ env.WKC }}
+ # git reset --hard
+ # git clean -f
+ # git remote prune origin
+ # git fetch
+ # git checkout "$target_branch"
+ # git remote prune origin
+ # git pull >/dev/null
- # check whether to run function test cases
- changed_files_non_tdgpt=$(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD $target_branch) | \
- grep -v "^docs/en/" | \
- grep -v "^docs/zh/" | \
- grep -v ".md$" | \
- grep -Ev "forecastoperator\.c|anomalywindowoperator\.c|tanalytics\.h|tanalytics\.c|tdgpt_cases\.task|analytics|tdgpt" | \
- tr '\n' ' ' || :)
- echo "changed file exclude tdgpt: ${changed_files_non_tdgpt}"
- if [ -n "$changed_files_non_tdgpt" ]; then
- run_function_test="true"
- else
- run_function_test="false"
- fi
- echo "run function test: ${run_function_test}"
- fi
+ # # Check whether to run tdgpt test cases
+ # changed_files_non_doc=$(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD $target_branch) | grep -v "^docs/en/" | grep -v "^docs/zh/" | grep -v ".md$" | tr '\n' ' ' || :)
+ # echo "changed files exclude doc: ${changed_files_non_doc}"
+
+ # if [[ -n "$changed_files_non_doc" && "$changed_files_non_doc" =~ (forecastoperator\.c|anomalywindowoperator\.c|tanalytics\.h|tanalytics\.c|tdgpt_cases\.task|analytics|tdgpt) ]]; then
+ # run_tdgpt_test="true"
+ # else
+ # run_tdgpt_test="false"
+ # fi
+ # echo "run tdgpt test: ${run_tdgpt_test}"
- echo "tdinternal=$tdinternal" >> $GITHUB_OUTPUT
+ # # Check whether to run function test cases
+ # changed_files_non_tdgpt=$(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD $target_branch) | \
+ # grep -v "^docs/en/" | \
+ # grep -v "^docs/zh/" | \
+ # grep -v ".md$" | \
+ # grep -Ev "forecastoperator\.c|anomalywindowoperator\.c|tanalytics\.h|tanalytics\.c|tdgpt_cases\.task|analytics|tdgpt" | \
+ # tr '\n' ' ' || :)
+ # echo "changed files exclude tdgpt: ${changed_files_non_tdgpt}"
+
+ # if [ -n "$changed_files_non_tdgpt" ]; then
+ # run_function_test="true"
+ # else
+ # run_function_test="false"
+ # fi
+
+ # echo "run function test: ${run_function_test}"
+
+ run_tdgpt_test="true"
+ run_function_test="true"
+ # Output the results for GitHub Actions
echo "run_function_test=$run_function_test" >> $GITHUB_OUTPUT
echo "run_tdgpt_test=$run_tdgpt_test" >> $GITHUB_OUTPUT
- echo "source_branch=$source_branch" >> $GITHUB_OUTPUT
- echo "target_branch=$target_branch" >> $GITHUB_OUTPUT
- echo "pr_number=$pr_number" >> $GITHUB_OUTPUT
+
+ echo ${{ github.event.pull_request.head.ref }}
+ echo ${{ github.event.pull_request.base.ref }}
+ echo ${{ github.event.pull_request.number }}
run-tests-on-linux:
+ uses: taosdata/.github/.github/workflows/run-tests-on-linux.yml@main
needs: fetch-parameters
- runs-on:
- group: CI
- labels: [self-hosted, Linux, X64, testing]
- timeout-minutes: 200
- env:
- IS_TDINTERNAL: ${{ needs.fetch-parameters.outputs.tdinternal }}
- RUN_RUNCTION_TEST: ${{ needs.fetch-parameters.outputs.run_function_test }}
- RUN_TDGPT_TEST: ${{ needs.fetch-parameters.outputs.run_tdgpt_test }}
- SOURCE_BRANCH: ${{ needs.fetch-parameters.outputs.source_branch }}
- TARGET_BRANCH: ${{ needs.fetch-parameters.outputs.target_branch }}
- PR_NUMBER: ${{ needs.fetch-parameters.outputs.pr_number }}
- steps:
- - name: Output the environment information
- run: |
- echo "::group::Environment Info"
- date
- hostname
- env
- echo "Runner: ${{ runner.name }}"
- echo "Trigger Source from TDinternal: ${{ env.IS_TDINTERNAL }}"
- echo "Workspace: ${{ env.WKDIR }}"
- git --version
- echo "${{ env.WKDIR }}/restore.sh -p ${{ env.PR_NUMBER }} -n ${{ github.run_number }} -c ${{ env.CONTAINER_NAME }}"
- echo "::endgroup::"
-
- - name: Prepare repositories
- run: |
- set -euo pipefail
- prepare_environment() {
- cd "$1"
- git reset --hard
- git clean -f
- git remote prune origin
- git fetch
- git checkout "$2"
- }
- prepare_environment "${{ env.WK }}" "${{ env.TARGET_BRANCH }}"
- prepare_environment "${{ env.WKC }}" "${{ env.TARGET_BRANCH }}"
-
- - name: Get latest codes and logs for TDinternal PR
- if: ${{ env.IS_TDINTERNAL == 'true' }}
- run: |
- cd ${{ env.WK }}
- git pull >/dev/null
- git log -5
- echo "`date "+%Y%m%d-%H%M%S"` TDinternalTest/${{ env.PR_NUMBER }}:${{ github.run_number }}:${{ env.TARGET_BRANCH }}" >>${{ env.WKDIR }}/jenkins.log
- echo "CHANGE_BRANCH:${{ env.SOURCE_BRANCH }}" >>${{ env.WKDIR }}/jenkins.log
- echo "TDinternal log: `git log -5`" >>${{ env.WKDIR }}/jenkins.log
- git fetch origin +refs/pull/${{ env.PR_NUMBER }}/merge
- git checkout -qf FETCH_HEAD
- git log -5
- echo "TDinternal log merged: `git log -5`" >>${{ env.WKDIR }}/jenkins.log
- cd ${{ env.WKC }}
- git remote prune origin
- git pull >/dev/null
- git log -5
- echo "community log: `git log -5`" >>${{ env.WKDIR }}/jenkins.log
- - name: Get latest codes and logs for TDengine PR
- if: ${{ env.IS_TDINTERNAL == 'false' }}
- run: |
- cd ${{ env.WKC }}
- git remote prune origin
- git pull >/dev/null
- git log -5
- echo "`date "+%Y%m%d-%H%M%S"` TDengineTest/${{ env.PR_NUMBER }}:${{ github.run_number }}:${{ env.TARGET_BRANCH }}" >>${{ env.WKDIR }}/jenkins.log
- echo "CHANGE_BRANCH:${{ env.SOURCE_BRANCH }}" >>${{ env.WKDIR }}/jenkins.log
- echo "community log: `git log -5`" >>${{ env.WKDIR }}/jenkins.log
- git fetch origin +refs/pull/${{ env.PR_NUMBER }}/merge
- git checkout -qf FETCH_HEAD
- git log -5
- echo "community log merged: `git log -5`" >>${{ env.WKDIR }}/jenkins.log
- cd ${{ env.WK }}
- git pull >/dev/null
- git log -5
- echo "TDinternal log: `git log -5`" >>${{ env.WKDIR }}/jenkins.log
- - name: Update submodule
- run: |
- cd ${{ env.WKC }}
- git submodule update --init --recursive
- - name: Output the 'file_no_doc_changed' information to the file
- if: ${{ env.IS_TDINTERNAL == 'false' && env.TARGET_BRANCH != '3.1' }}
- run: |
- mkdir -p ${{ env.WKDIR }}/tmp/${{ env.PR_NUMBER }}_${{ github.run_number }}
- cd ${{ env.WKC }}
- changed_files_non_doc=$(git --no-pager diff --name-only FETCH_HEAD `git merge-base FETCH_HEAD ${{ env.TARGET_BRANCH }}`|grep -v "^docs/en/"|grep -v "^docs/zh/"|grep -v ".md$" | tr '\n' ' ' || :)
- echo $changed_files_non_doc > ${{ env.WKDIR }}/tmp/${{ env.PR_NUMBER }}_${{ github.run_number }}/docs_changed.txt
- - name: Check assert testing
- if: ${{ env.IS_TDINTERNAL == 'false' && env.TARGET_BRANCH != '3.1' }}
- run: |
- cd ${{ env.WKC }}/tests/parallel_test
- ./run_check_assert_container.sh -d ${{ env.WKDIR }}
- - name: Check void function testing
- if: ${{ env.IS_TDINTERNAL == 'false' && env.TARGET_BRANCH != '3.1' }}
- run: |
- cd ${{ env.WKC }}/tests/parallel_test
- ./run_check_void_container.sh -d ${{ env.WKDIR }}
- - name: Build docker container
- if: ${{ env.RUN_RUNCTION_TEST == 'true' }}
- run: |
- date
- rm -rf ${{ env.WKC }}/debug
- cd ${{ env.WKC }}/tests/parallel_test
- time ./container_build.sh -w ${{ env.WKDIR }} -e
- - name: Get parameters for testing
- id: get_param
- run: |
- log_server_file="/home/log_server.json"
- timeout_cmd=""
- extra_param=""
-
- if [ -f "$log_server_file" ]; then
- log_server_enabled=$(jq '.enabled' "$log_server_file")
- timeout_param=$(jq '.timeout' "$log_server_file")
- if [ "$timeout_param" != "null" ] && [ "$timeout_param" != "0" ]; then
- timeout_cmd="timeout $timeout_param"
- fi
-
- if [ "$log_server_enabled" == "1" ]; then
- log_server=$(jq '.server' "$log_server_file" | sed 's/\\\"//g')
- if [ "$log_server" != "null" ] && [ "$log_server" != "" ]; then
- extra_param="-w $log_server"
- fi
- fi
- fi
- echo "timeout_cmd=$timeout_cmd" >> $GITHUB_OUTPUT
- echo "extra_param=$extra_param" >> $GITHUB_OUTPUT
- - name: Run function returns with a null pointer scan testing
- if: ${{ env.IS_TDINTERNAL == 'false' && env.TARGET_BRANCH != '3.1' }}
- run: |
- cd ${{ env.WKC }}/tests/parallel_test
- ./run_scan_container.sh -d ${{ env.WKDIR }} -b ${{ env.PR_NUMBER }}_${{ github.run_number }} -f ${{ env.WKDIR }}/tmp/${{ env.PR_NUMBER }}_${{ github.run_number }}/docs_changed.txt ${{ steps.get_param.outputs.extra_param }}
- - name: Run tdgpt test cases
- if: ${{ env.IS_TDINTERNAL == 'false' && env.TARGET_BRANCH != '3.1' && env.RUN_TDGPT_TEST == 'true' }}
- run: |
- cd ${{ env.WKC }}/tests/parallel_test
- export DEFAULT_RETRY_TIME=2
- date
- timeout 600 time ./run.sh -e -m /home/m.json -t tdgpt_cases.task -b ${{ env.PR_NUMBER }}_${{ github.run_number }} -l ${{ env.WKDIR }}/log -o 300 ${{ steps.get_param.outputs.extra_param }}
- - name: Run function test cases
- if: ${{ env.RUN_RUNCTION_TEST == 'true'}}
- run: |
- cd ${{ env.WKC }}/tests/parallel_test
- export DEFAULT_RETRY_TIME=2
- date
- ${{ steps.get_param.outputs.timeout_cmd }} time ./run.sh -e -m /home/m.json -t cases.task -b ${{ env.PR_NUMBER }}_${{ github.run_number }} -l ${{ env.WKDIR }}/log -o 1200 ${{ steps.get_param.outputs.extra_param }}
+ if: ${{ needs.fetch-parameters.outputs.run_tdgpt_test == 'true' || needs.fetch-parameters.outputs.run_function_test == 'true' }}
+ with:
+ tdinternal: false
+ run_function_test: ${{ needs.fetch-parameters.outputs.run_function_test == 'true' }}
+ run_tdgpt_test: ${{ needs.fetch-parameters.outputs.run_tdgpt_test == 'true' }}
run-tests-on-mac:
+ uses: taosdata/.github/.github/workflows/run-tests-on-macos.yml@main
needs: fetch-parameters
if: ${{ needs.fetch-parameters.outputs.run_function_test == 'true' }}
- runs-on:
- group: CI
- labels: [self-hosted, macOS, testing]
- timeout-minutes: 60
- env:
- IS_TDINTERNAL: ${{ needs.fetch-parameters.outputs.tdinternal }}
- SOURCE_BRANCH: ${{ needs.fetch-parameters.outputs.source_branch }}
- TARGET_BRANCH: ${{ needs.fetch-parameters.outputs.target_branch }}
- PR_NUMBER: ${{ needs.fetch-parameters.outputs.pr_number }}
- steps:
- - name: Output the environment information
- run: |
- echo "::group::Environment Info"
- date
- hostname
- env
- echo "Runner: ${{ runner.name }}"
- echo "Trigger Source from TDinternal: ${{ env.IS_TDINTERNAL }}"
- echo "Workspace: ${{ env.WKDIR }}"
- git --version
- echo "${{ env.WKDIR }}/restore.sh -p ${{ env.PR_NUMBER }} -n ${{ github.run_number }} -c ${{ env.CONTAINER_NAME }}"
- echo "::endgroup::"
- - name: Prepare repositories
- run: |
- set -euo pipefail
- prepare_environment() {
- cd "$1"
- git reset --hard
- git clean -f
- git remote prune origin
- git fetch
- git checkout "$2"
- }
- prepare_environment "${{ env.WK }}" "${{ env.TARGET_BRANCH }}"
- prepare_environment "${{ env.WKC }}" "${{ env.TARGET_BRANCH }}"
- - name: Get latest codes and logs for TDinternal PR
- if: ${{ env.IS_TDINTERNAL == 'true' }}
- run: |
- cd ${{ env.WK }}
- git pull >/dev/null
- git log -5
- echo "`date "+%Y%m%d-%H%M%S"` TDinternalTest/${{ env.PR_NUMBER }}:${{ github.run_number }}:${{ env.TARGET_BRANCH }}" >>${{ env.WKDIR }}/jenkins.log
- echo "CHANGE_BRANCH:${{ env.SOURCE_BRANCH }}" >>${{ env.WKDIR }}/jenkins.log
- echo "TDinternal log: `git log -5`" >>${{ env.WKDIR }}/jenkins.log
- git fetch origin +refs/pull/${{ env.PR_NUMBER }}/merge
- git checkout -qf FETCH_HEAD
- git log -5
- echo "TDinternal log merged: `git log -5`" >>${{ env.WKDIR }}/jenkins.log
- cd ${{ env.WKC }}
- git remote prune origin
- git pull >/dev/null
- git log -5
- echo "community log: `git log -5`" >>${{ env.WKDIR }}/jenkins.log
- - name: Get latest codes and logs for TDengine PR
- if: ${{ env.IS_TDINTERNAL == 'false' }}
- run: |
- cd ${{ env.WKC }}
- git remote prune origin
- git pull >/dev/null
- git log -5
- echo "`date "+%Y%m%d-%H%M%S"` TDengineTest/${{ env.PR_NUMBER }}:${{ github.run_number }}:${{ env.TARGET_BRANCH }}" >>${{ env.WKDIR }}/jenkins.log
- echo "CHANGE_BRANCH:${{ env.SOURCE_BRANCH }}" >>${{ env.WKDIR }}/jenkins.log
- echo "community log: `git log -5`" >>${{ env.WKDIR }}/jenkins.log
- git fetch origin +refs/pull/${{ env.PR_NUMBER }}/merge
- git checkout -qf FETCH_HEAD
- git log -5
- echo "community log merged: `git log -5`" >>${{ env.WKDIR }}/jenkins.log
- cd ${{ env.WK }}
- git pull >/dev/null
- git log -5
- echo "TDinternal log: `git log -5`" >>${{ env.WKDIR }}/jenkins.log
- - name: Update submodule
- run: |
- cd ${{ env.WKC }}
- git submodule update --init --recursive
- - name: Run tests
- run: |
- date
- cd ${{ env.WK }}
- rm -rf debug
- mkdir debug
- cd ${{ env.WK }}/debug
- echo $PATH
- echo "PATH=/opt/homebrew/bin:$PATH" >> $GITHUB_ENV
- cmake .. -DBUILD_TEST=true -DBUILD_HTTPS=false -DCMAKE_BUILD_TYPE=Release
- make -j10
- ctest -j10 || exit 7
- date
+ with:
+ tdinternal: false
run-tests-on-windows:
+ uses: taosdata/.github/.github/workflows/run-tests-on-windows.yml@main
needs: fetch-parameters
if: ${{ needs.fetch-parameters.outputs.run_function_test == 'true' }}
- runs-on:
- group: CI
- labels: [self-hosted, Windows, X64, testing]
- timeout-minutes: 126
- env:
- IS_TDINTERNAL: ${{ needs.fetch-parameters.outputs.tdinternal }}
- SOURCE_BRANCH: ${{ needs.fetch-parameters.outputs.source_branch }}
- TARGET_BRANCH: ${{ needs.fetch-parameters.outputs.target_branch }}
- PR_NUMBER: ${{ needs.fetch-parameters.outputs.pr_number }}
- WIN_INTERNAL_ROOT: "C:\\workspace\\0\\TDinternal"
- WIN_COMMUNITY_ROOT: "C:\\workspace\\0\\TDinternal\\community"
- WIN_SYSTEM_TEST_ROOT: "C:\\workspace\\0\\TDinternal\\community\\tests\\system-test"
- WIN_VS_PATH: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat"
- WIN_CPU_TYPE: "x64"
- steps:
- - name: Output the environment information
- run: |
- hostname
- taskkill /f /t /im python.exe
- taskkill /f /t /im bash.exe
- taskkill /f /t /im taosd.exe
- ipconfig
- set
- date /t
- time /t
- rd /s /Q "%WIN_INTERNAL_ROOT%\debug" || exit 0
- shell: cmd
- - name: Prepare repositories
- run: |
- :: Prepare internal repository
- if exist "%WIN_INTERNAL_ROOT%" (
- cd /d "%WIN_INTERNAL_ROOT%"
- git reset --hard
- git clean -f
- git remote prune origin
- git fetch
- git checkout "%TARGET_BRANCH%"
- ) else (
- echo Directory does not exist: "%WIN_INTERNAL_ROOT%"
- exit 1
- )
-
- :: Prepare community repository
- if exist "%WIN_COMMUNITY_ROOT%" (
- cd /d "%WIN_COMMUNITY_ROOT%"
- git reset --hard
- git clean -f
- git remote prune origin
- git fetch
- git checkout "%TARGET_BRANCH%"
- ) else (
- echo Directory does not exist: "%WIN_COMMUNITY_ROOT%"
- exit 1
- )
- shell: cmd
- - name: Get latest codes and logs for TDinternal PR
- if: ${{ env.IS_TDINTERNAL == 'true' }}
- run: |
- cd %WIN_INTERNAL_ROOT%
- git pull origin %TARGET_BRANCH%
- git fetch origin +refs/pull/%PR_NUMBER%/merge
- git checkout -qf FETCH_HEAD
- cd %WIN_COMMUNITY_ROOT%
- git remote prune origin
- git pull
- shell: cmd
- - name: Get latest codes and logs for TDengine PR
- if: ${{ env.IS_TDINTERNAL == 'false' }}
- run: |
- cd %WIN_INTERNAL_ROOT%
- git pull origin %TARGET_BRANCH%
- cd %WIN_COMMUNITY_ROOT%
- git remote prune origin
- git pull origin %TARGET_BRANCH%
- git fetch origin +refs/pull/%PR_NUMBER%/merge
- git checkout -qf FETCH_HEAD
- shell: cmd
- - name: Output branch and log information
- run: |
- cd %WIN_INTERNAL_ROOT%
- git branch
- git log -5
-
- cd %WIN_COMMUNITY_ROOT%
- git branch
- git log -5
- shell: cmd
- - name: Update submodule
- run: |
- cd %WIN_COMMUNITY_ROOT%
- git submodule update --init --recursive
- shell: cmd
- - name: Build on windows
- run: |
- echo "building ..."
- time /t
- cd %WIN_INTERNAL_ROOT%
- mkdir debug
- cd debug
- time /t
- call "%WIN_VS_PATH%" %WIN_CPU_TYPE%
- set CL=/MP8
- echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> cmake"
- time /t
- cmake .. -G "NMake Makefiles JOM" -DBUILD_TEST=true -DBUILD_TOOLS=true || exit 7
- echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> jom -j 6"
- time /t
- jom -j 6 || exit 8
- time /t
-
- cd %WIN_COMMUNITY_ROOT%/tests/ci
- pip3 install taospy==2.7.21
- pip3 install taos-ws-py==0.3.8
- xcopy /e/y/i/f %WIN_INTERNAL_ROOT%\\debug\\build\\lib\\taos.dll C:\\Windows\\System32
- shell: cmd
- - name: Run ctest
- run: |
- echo "windows ctest ..."
- time /t
- cd %WIN_INTERNAL_ROOT%\\debug
- ctest -j 1 || exit 7
- time /t
- shell: cmd
- - name: Run function test
- run: |
- echo "windows test ..."
- xcopy /e/y/i/f "%WIN_INTERNAL_ROOT%\debug\build\lib\taos.dll" C:\Windows\System32
- ls -l "C:\Windows\System32\taos.dll"
- time /t
- cd %WIN_SYSTEM_TEST_ROOT%
- echo "testing ..."
- test-all.bat ci
- time /t
- shell: cmd
+ with:
+ tdinternal: false
diff --git a/.github/workflows/tdgpt-ci.yml b/.github/workflows/tdgpt-ci.yml
new file mode 100644
index 0000000000..4a438938dc
--- /dev/null
+++ b/.github/workflows/tdgpt-ci.yml
@@ -0,0 +1,51 @@
+name: TDgpt CI
+
+on:
+ pull_request:
+ branches:
+ - '3.0'
+ paths:
+ - 'tools/tdgpt/**'
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ python-version: ["3.10"]
+
+ defaults:
+ run:
+ working-directory: ${{ github.workspace }}/tools/tdgpt
+
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Set up Python ${{ matrix.python-version }}
+ uses: actions/setup-python@v3
+ with:
+ python-version: ${{ matrix.python-version }}
+ cache: 'pip'
+
+ - name: Install dependencies
+ run: |
+ python -m pip install --upgrade pip
+ python -m pip install flake8 pytest pylint
+ if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+
+ - name: Checking the code with pylint
+ run: |
+ pylint $(git ls-files '*.py') --exit-zero
+
+ - name: Checking the code with flake8
+ run: |
+ # stop the build if there are Python syntax errors or undefined names
+ flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+ # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+ flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+
+ - name: Run test cases with pytest
+ run: |
+ pytest
diff --git a/.github/workflows/tdgpt-update-service.yml b/.github/workflows/tdgpt-update-service.yml
new file mode 100644
index 0000000000..fa7344ce74
--- /dev/null
+++ b/.github/workflows/tdgpt-update-service.yml
@@ -0,0 +1,41 @@
+name: TDgpt Update Service
+
+on:
+ schedule:
+ - cron: '30 00 * * *'
+
+env:
+ WKC: "/root/TDengine"
+
+jobs:
+ update-service:
+ runs-on:
+ group: CI
+ labels: [self-hosted, Linux, X64, tdgpt-anode-service]
+ steps:
+ - name: Update TDengine codes
+ run: |
+ set -euo pipefail
+ cd ${{ env.WKC }}
+ git checkout 3.0
+
+ - name: Package the TDGpt Anode Service
+ run: |
+ set -euo pipefail
+ cd ${{ env.WKC }}/tools/tdgpt/script && ./release.sh
+
+ - name: Reinstall and restart the TDGpt Anode Service
+ run: |
+ set -euo pipefail
+ cd ${{ env.WKC }}/tools/tdgpt/release
+ if [[ -f "TDengine-enterprise-anode-1.0.1.tar.gz" ]]; then
+ tar -xzf TDengine-enterprise-anode-1.0.1.tar.gz
+ cd TDengine-enterprise-anode-1.0.1
+ ./install.sh
+ fi
+ systemctl restart taosanoded
+
+ - name: Clean up
+ if: always()
+ run: |
+ if [[ -f ${{ env.WKC }}/tools/tdgpt/release/TDengine-enterprise-anode-1.0.1 ]] then rm -rf ${{ env.WKC }}/tools/tdgpt/release/TDengine-enterprise-anode-1.0.1; fi
diff --git a/Jenkinsfile2 b/Jenkinsfile2
index 3135b7b683..8853d068cb 100644
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -112,16 +112,6 @@ def build_pre_docs(){
git fetch origin +refs/pull/${CHANGE_ID}/merge
git checkout -qf FETCH_HEAD
'''
-
- sh '''
- cd ${DOC_WKC}/${tools_repo}
- git reset --hard
- git clean -f
- git fetch
- git remote prune origin
- git checkout ''' + env.CHANGE_TARGET + '''
- git pull >/dev/null
- '''
}
}
diff --git a/docs/en/05-basic/03-query.md b/docs/en/05-basic/03-query.md
index 463f58fd6e..d0aef17f4d 100644
--- a/docs/en/05-basic/03-query.md
+++ b/docs/en/05-basic/03-query.md
@@ -145,20 +145,19 @@ Query OK, 10 row(s) in set (2.415961s)
In TDengine, you can use the window clause to perform aggregation queries by time window partitioning, which is particularly suitable for scenarios requiring analysis of large amounts of time-series data, such as smart meters collecting data every 10s but needing to query the average temperature every 1min.
-The window clause allows you to partition the queried data set by windows and aggregate the data within each window, including:
-
-- Time window (time window)
-- State window (status window)
-- Session window (session window)
-- Event window (event window)
-
-The logic of window partitioning is shown in the following image:
+The window clause allows you to partition the queried data set by windows and aggregate the data within each window. The logic of window partitioning is shown in the following image:
Figure 1. Windowing logic
+- Time Window: Data is divided based on time intervals, supporting sliding and tumbling time windows, suitable for data aggregation over fixed time periods.
+- Status Window: Windows are divided based on changes in device status values, with data of the same status value grouped into one window, which closes when the status value changes.
+- Session Window: Sessions are divided based on the differences in record timestamps, with records having a timestamp interval less than the predefined value belonging to the same session.
+- Event Window: Windows are dynamically divided based on the start and end conditions of events, opening when the start condition is met and closing when the end condition is met.
+- Count Window: Windows are divided based on the number of data rows, with each window consisting of a specified number of rows for aggregation calculations.
+
The syntax for the window clause is as follows:
```sql
diff --git a/docs/en/06-advanced/05-data-in/07-mqtt.md b/docs/en/06-advanced/05-data-in/07-mqtt.md
index 73ef3b534c..47ffa82bf2 100644
--- a/docs/en/06-advanced/05-data-in/07-mqtt.md
+++ b/docs/en/06-advanced/05-data-in/07-mqtt.md
@@ -86,9 +86,15 @@ The keep alive interval is the time interval negotiated between the client and t
In **Clean Session**, choose whether to clear the session. The default value is true.
-Fill in the Topic names to be consumed in **Subscription Topics and QoS Configuration**. Use the following format: `topic1::0,topic2::1`.
+In the **Topics Qos Config**, fill in the topic name and QoS to subscribe. Use the following format: `{topic_name}::{qos}` (e.g., `my_topic::0`). MQTT protocol 5.0 supports shared subscriptions, allowing multiple clients to subscribe to the same topic for load balancing. Use the following format: `$share/{group_name}/{topic_name}::{qos}`, where `$share` is a fixed prefix indicating the enablement of shared subscription, and `group_name` is the client group name, similar to Kafka's consumer group.
-Click the **Check Connectivity** button to check if the data source is available.
+In the **Topic Analysis**, fill in the MQTT topic parsing rules. The format is the same as the MQTT Topic, parsing each level of the MQTT Topic into corresponding variable names, with `_` indicating that the current level is ignored during parsing. For example: if the MQTT Topic `a/+/c` corresponds to the parsing rule `v1/v2/_`, it means assigning the first level `a` to variable `v1`, the value of the second level (where the wildcard `+` represents any value) to variable `v2`, and ignoring the value of the third level `c`, which will not be assigned to any variable. In the `payload parsing` below, the variables obtained from Topic parsing can also participate in various transformations and calculations.
+
+In the **Compression**, configure the message body compression algorithm. After receiving the message, taosX uses the corresponding compression algorithm to decompress the message body and obtain the original data. Options include none (no compression), gzip, snappy, lz4, and zstd, with the default being none.
+
+In the **Char Encoding**, configure the message body encoding format. After receiving the message, taosX uses the corresponding encoding format to decode the message body and obtain the original data. Options include UTF_8, GBK, GB18030, and BIG5, with the default being UTF_8.
+
+Click the **Check Connection** button to check if the data source is available.
diff --git a/docs/en/08-operation/03-deployment/03-kubernetes.md b/docs/en/08-operation/03-deployment/03-kubernetes.md
index dbb6022ce6..fdec50b9d6 100644
--- a/docs/en/08-operation/03-deployment/03-kubernetes.md
+++ b/docs/en/08-operation/03-deployment/03-kubernetes.md
@@ -339,7 +339,7 @@ Helm operates Kubernetes using kubectl and kubeconfig configurations, which can
The TDengine Chart has not yet been released to the Helm repository, it can currently be downloaded directly from GitHub:
```shell
-wget https://github.com/taosdata/TDengine-Operator/raw/3.0/helm/tdengine-enterpise-3.5.0.tgz
+wget https://github.com/taosdata/TDengine-Operator/raw/refs/heads/3.0/helm/tdengine-enterprise-3.5.0.tgz
```
Note that it's for the enterprise edition, and the community edition is not yet available.
diff --git a/docs/en/10-third-party/05-bi/12-tableau.md b/docs/en/10-third-party/05-bi/12-tableau.md
index db8a569926..d871451798 100644
--- a/docs/en/10-third-party/05-bi/12-tableau.md
+++ b/docs/en/10-third-party/05-bi/12-tableau.md
@@ -27,19 +27,19 @@ It should be noted that when configuring the ODBC data source for Tableau, the [
**Step 3**, Click the `DSN` radio button, then select the configured data source (MyTDengine), and click the `Connect` button. After the connection is successful, delete the content of the string attachment, and finally click the `Sign In` button.
-
+
## Data Analysis
**Step 1**, In the workbook page, the connected data sources will be displayed. Clicking on the dropdown list of databases will display the databases that require data analysis. On this basis, click the search button in the table options to display all tables in the database. Then, drag the table to be analyzed to the right area to display the table structure.
-
+
**Step 2**, Click the `Update Now` button below to display the data in the table.
-
+
**Step 3**, Click on the "Worksheet" at the bottom of the window to pop up the data analysis window, which displays all the fields of the analysis table. Drag the fields to the rows and columns to display the chart.
-
+
diff --git a/docs/en/10-third-party/05-bi/13-excel.md b/docs/en/10-third-party/05-bi/13-excel.md
index 114954e81f..47ee780c02 100644
--- a/docs/en/10-third-party/05-bi/13-excel.md
+++ b/docs/en/10-third-party/05-bi/13-excel.md
@@ -21,22 +21,22 @@ Prepare the following environment:
**Step 2**, Start Excel in the Windows system environment, then select [Data] -> [Get Data] -> [From Other Sources] -> [From ODBC].
-
+
**Step 3**, In the pop-up window, select the data source you need to connect to from the drop-down list of [Data source name (DSN)], and then click the [OK] button.
-
+
**Step 4**, Enter the username and password for TDengine.
-
+
**Step 5**, In the pop-up [Navigator] dialog box, select the database tables you want to load, and then click [Load] to complete the data loading.
-
+
## Data Analysis
Select the imported data. On the [Insert] tab, choose the column chart, and then configure the data fields in the [PivotChart Fields] pane on the right.
-
+
diff --git a/docs/en/10-third-party/05-bi/14-finebi.md b/docs/en/10-third-party/05-bi/14-finebi.md
new file mode 100644
index 0000000000..2088b381e9
--- /dev/null
+++ b/docs/en/10-third-party/05-bi/14-finebi.md
@@ -0,0 +1,82 @@
+---
+sidebar_label: FineBI
+title: Integration With FineBI
+toc_max_heading_level: 4
+---
+
+Fanruan is a technology company specializing in the field of business intelligence and data analytics. With its self-developed core products, FineBI and FineReport, the company has established a leading position in the industry. Fanruan's BI tools are widely adopted by enterprises across various sectors, empowering users to achieve data visualization analysis, report generation, and data-driven decision support.
+
+By using the TDengine Java connector, FineBI can quickly access the data in TDengine. Users can directly connect to the TDengine database in FineBI, obtain time-series data for analysis, and create visual reports, and the entire process does not require any code writing.
+
+## Prerequisites
+
+- TDengine 3.3.4.0 and above version is installed and running normally (both Enterprise and Community versions are available).
+- taosAdapter is running normally, refer to [taosAdapter Reference](../../../tdengine-reference/components/taosadapter/).
+- Install FineBI (if not installed, please download and install [Download FineBI](https://intl.finebi.com/download)).
+- Download the fine_conf_entity plugin to support the addition of JDBC drivers, [Download link](https://market.fanruan.com/plugin/1052a471-0239-4cd8-b832-045d53182c5d).
+- Install the JDBC driver. Download the `TDengine JDBC connector` file `taos-jdbcdriver-3.4.0-dist.jar` or a higher version from `maven.org`.
+
+## Configure Data Source
+
+**Step 1**, In the `db.script` configuration file of the FineBI server, find the `SystemConfig.driverUpload` configuration item and change its value to true.
+
+- Windows system: The path of the configuration file is webapps/webroot/WEB-INF/embed/finedb/db.script under the installation directory.
+- Linux/Mac system: The path of the configuration file is /usr/local/FineBI6.1/webapps/webroot/WEB-INF/embed/finedb/db.script.
+
+**Step 2**, Start the FineBI service. Enter `http://ip:37799/webroot/decision` in the browser, where "ip" is the IP address of the FineBI server.
+
+**Step 3**, After logging in to the FineBI Web page, click [System Management] -> [Plugin Management]. In the [Store App] on the right side, click [Install From Local] and select the downloaded `fine_conf_entity` plugin for installation.
+
+
+
+**Step 4**, Click [System Management] -> [Data Connection] -> [Data Connection Management]. On the right-hand page, click the [Driver Management] button to open the configuration page. Then click the [New Driver] button, and in the pop-up window, enter a name (for example, `tdengine-websocket`) to configure the JDBC driver.
+
+
+
+**Step 5**, On the driver configuration page, click the [Upload File] button. Select the downloaded TDengine Java Connector (e.g., `taos-jdbcdriver-3.4.0-dist.jar`) for uploading. After the upload is complete, select `com.taosdata.jdbc.ws.WebSocketDriver` from the drop-down list of [Driver], and then click [Save].
+
+
+
+**Step 6**, On the "Data Connection Management" page, click the [New Data Connection] button. Subsequently, click "Others", and then on the right-side page, click "Other JDBC" to perform the connection configuration.
+
+
+
+**Step 7**, On the configuration page, first enter the name of the data connection. Then, select "Custom" in the [Driver] option and choose the configured driver from the drop-down list (e.g., `com.taosdata.jdbc.ws.WebSocketDriver (tdengine-websocket)`). After that, configure the "Data Connection URL" (e.g., `jdbc:TAOS-WS://localhost:6041/power?user=root&password=taosdata&fineBIDialect=mysql`). Once the settings are completed, click [Test Connection] in the top-right corner to test the connection. After the verification is successful, click [Save] to finish the configuration.
+
+:::tip
+`fineBIDialect=mysql` The meaning of this setting is to adopt the SQL dialect rules of the MySQL database. Simply put, it tells FineBI to parse and execute relevant queries and operations in the specific way that the MySQL database handles SQL statements.
+:::
+
+
+
+## Data Analysis
+
+### Data preparation
+
+**Step 1**, Click [Public Data]. On the right - hand page, click [New Folder] to create a folder (e.g., TDengine). Then, click the [+] button on the right side of the folder to create a "Database Table" dataset or an "SQL Dataset".
+
+
+
+**Step 2**, Click "Database Table" to open the database table selection page. In the "Data Connection" section on the left, select the previously created connection. Then, all the tables in the database of the current connection will be displayed on the right. Select the table you need to load (e.g., meters), and click [OK]. The data in the meters table will then be displayed.
+
+
+
+
+
+**Step 3**, Click "SQL Dataset" to open the configuration page for the SQL dataset. First, enter the table name (used for display on the FineBI page). Then, select the previously created connection from the drop-down list of "Data from Data Connection". After that, enter the SQL statement and click "Preview" to view the query results. Finally, click [OK] to successfully create the SQL dataset.
+
+
+
+### Smart Meter Example
+
+**Step 1**, Click [My Analysis]. On the right-hand page, click [New Folder] to create a folder (for example, `TDengine`). Then, click the [+] button on the right side of the folder to create an "Analysis Subject".
+
+
+
+**Step 2**, On the analysis subject page, select the dataset (for example, `meters`) and then click the [OK] button to complete the association of the dataset.
+
+
+
+**Step 3**, Click the [Component] tab at the bottom of the analysis subject page to open the chart configuration page. Drag the fields to the horizontal axis or the vertical axis, and then the chart will be displayed.
+
+
diff --git a/docs/en/10-third-party/05-bi/excel/odbc-config.jpg b/docs/en/10-third-party/05-bi/excel/odbc-config.jpg
deleted file mode 100644
index a62c9eb18f..0000000000
Binary files a/docs/en/10-third-party/05-bi/excel/odbc-config.jpg and /dev/null differ
diff --git a/docs/en/10-third-party/05-bi/excel/odbc-config.webp b/docs/en/10-third-party/05-bi/excel/odbc-config.webp
new file mode 100644
index 0000000000..d18c4523ba
Binary files /dev/null and b/docs/en/10-third-party/05-bi/excel/odbc-config.webp differ
diff --git a/docs/en/10-third-party/05-bi/excel/odbc-data.jpg b/docs/en/10-third-party/05-bi/excel/odbc-data.jpg
deleted file mode 100644
index 9a16033e9b..0000000000
Binary files a/docs/en/10-third-party/05-bi/excel/odbc-data.jpg and /dev/null differ
diff --git a/docs/en/10-third-party/05-bi/excel/odbc-data.webp b/docs/en/10-third-party/05-bi/excel/odbc-data.webp
new file mode 100644
index 0000000000..ac7110309e
Binary files /dev/null and b/docs/en/10-third-party/05-bi/excel/odbc-data.webp differ
diff --git a/docs/en/10-third-party/05-bi/excel/odbc-load.jpg b/docs/en/10-third-party/05-bi/excel/odbc-load.jpg
deleted file mode 100644
index 7a6f829ff9..0000000000
Binary files a/docs/en/10-third-party/05-bi/excel/odbc-load.jpg and /dev/null differ
diff --git a/docs/en/10-third-party/05-bi/excel/odbc-load.webp b/docs/en/10-third-party/05-bi/excel/odbc-load.webp
new file mode 100644
index 0000000000..1ba6bffc8d
Binary files /dev/null and b/docs/en/10-third-party/05-bi/excel/odbc-load.webp differ
diff --git a/docs/en/10-third-party/05-bi/excel/odbc-menu.jpg b/docs/en/10-third-party/05-bi/excel/odbc-menu.jpg
deleted file mode 100644
index f7dedc9cbb..0000000000
Binary files a/docs/en/10-third-party/05-bi/excel/odbc-menu.jpg and /dev/null differ
diff --git a/docs/en/10-third-party/05-bi/excel/odbc-menu.webp b/docs/en/10-third-party/05-bi/excel/odbc-menu.webp
new file mode 100644
index 0000000000..c46f8ae619
Binary files /dev/null and b/docs/en/10-third-party/05-bi/excel/odbc-menu.webp differ
diff --git a/docs/en/10-third-party/05-bi/excel/odbc-select.jpg b/docs/en/10-third-party/05-bi/excel/odbc-select.jpg
deleted file mode 100644
index fe72c975d5..0000000000
Binary files a/docs/en/10-third-party/05-bi/excel/odbc-select.jpg and /dev/null differ
diff --git a/docs/en/10-third-party/05-bi/excel/odbc-select.webp b/docs/en/10-third-party/05-bi/excel/odbc-select.webp
new file mode 100644
index 0000000000..ea745234d6
Binary files /dev/null and b/docs/en/10-third-party/05-bi/excel/odbc-select.webp differ
diff --git a/docs/en/10-third-party/05-bi/finebi/analysis-chart.webp b/docs/en/10-third-party/05-bi/finebi/analysis-chart.webp
new file mode 100644
index 0000000000..3272dede26
Binary files /dev/null and b/docs/en/10-third-party/05-bi/finebi/analysis-chart.webp differ
diff --git a/docs/en/10-third-party/05-bi/finebi/analysis-object.webp b/docs/en/10-third-party/05-bi/finebi/analysis-object.webp
new file mode 100644
index 0000000000..8863ac2515
Binary files /dev/null and b/docs/en/10-third-party/05-bi/finebi/analysis-object.webp differ
diff --git a/docs/en/10-third-party/05-bi/finebi/common.webp b/docs/en/10-third-party/05-bi/finebi/common.webp
new file mode 100644
index 0000000000..ebf4e0ffff
Binary files /dev/null and b/docs/en/10-third-party/05-bi/finebi/common.webp differ
diff --git a/docs/en/10-third-party/05-bi/finebi/connect-manage.webp b/docs/en/10-third-party/05-bi/finebi/connect-manage.webp
new file mode 100644
index 0000000000..2ff0aa497f
Binary files /dev/null and b/docs/en/10-third-party/05-bi/finebi/connect-manage.webp differ
diff --git a/docs/en/10-third-party/05-bi/finebi/jdbc-config.webp b/docs/en/10-third-party/05-bi/finebi/jdbc-config.webp
new file mode 100644
index 0000000000..e5f4f436a9
Binary files /dev/null and b/docs/en/10-third-party/05-bi/finebi/jdbc-config.webp differ
diff --git a/docs/en/10-third-party/05-bi/finebi/jdbc-connect.webp b/docs/en/10-third-party/05-bi/finebi/jdbc-connect.webp
new file mode 100644
index 0000000000..fa32255b62
Binary files /dev/null and b/docs/en/10-third-party/05-bi/finebi/jdbc-connect.webp differ
diff --git a/docs/en/10-third-party/05-bi/finebi/load-data.webp b/docs/en/10-third-party/05-bi/finebi/load-data.webp
new file mode 100644
index 0000000000..f55748cb26
Binary files /dev/null and b/docs/en/10-third-party/05-bi/finebi/load-data.webp differ
diff --git a/docs/en/10-third-party/05-bi/finebi/new-driver.webp b/docs/en/10-third-party/05-bi/finebi/new-driver.webp
new file mode 100644
index 0000000000..53a3294ea6
Binary files /dev/null and b/docs/en/10-third-party/05-bi/finebi/new-driver.webp differ
diff --git a/docs/en/10-third-party/05-bi/finebi/plugin.webp b/docs/en/10-third-party/05-bi/finebi/plugin.webp
new file mode 100644
index 0000000000..b44fb0a83a
Binary files /dev/null and b/docs/en/10-third-party/05-bi/finebi/plugin.webp differ
diff --git a/docs/en/10-third-party/05-bi/finebi/select-table.webp b/docs/en/10-third-party/05-bi/finebi/select-table.webp
new file mode 100644
index 0000000000..190ad4dee0
Binary files /dev/null and b/docs/en/10-third-party/05-bi/finebi/select-table.webp differ
diff --git a/docs/en/10-third-party/05-bi/finebi/sql-data-config.webp b/docs/en/10-third-party/05-bi/finebi/sql-data-config.webp
new file mode 100644
index 0000000000..c27cc5bed3
Binary files /dev/null and b/docs/en/10-third-party/05-bi/finebi/sql-data-config.webp differ
diff --git a/docs/en/10-third-party/05-bi/finebi/table-data.webp b/docs/en/10-third-party/05-bi/finebi/table-data.webp
new file mode 100644
index 0000000000..4ecd7ae189
Binary files /dev/null and b/docs/en/10-third-party/05-bi/finebi/table-data.webp differ
diff --git a/docs/en/10-third-party/05-bi/tableau/tableau-analysis.jpg b/docs/en/10-third-party/05-bi/tableau/tableau-analysis.jpg
deleted file mode 100644
index 600bd286ac..0000000000
Binary files a/docs/en/10-third-party/05-bi/tableau/tableau-analysis.jpg and /dev/null differ
diff --git a/docs/en/10-third-party/05-bi/tableau/tableau-analysis.webp b/docs/en/10-third-party/05-bi/tableau/tableau-analysis.webp
new file mode 100644
index 0000000000..8ed29a42ce
Binary files /dev/null and b/docs/en/10-third-party/05-bi/tableau/tableau-analysis.webp differ
diff --git a/docs/en/10-third-party/05-bi/tableau/tableau-data.jpg b/docs/en/10-third-party/05-bi/tableau/tableau-data.jpg
deleted file mode 100644
index 9b8c7ba546..0000000000
Binary files a/docs/en/10-third-party/05-bi/tableau/tableau-data.jpg and /dev/null differ
diff --git a/docs/en/10-third-party/05-bi/tableau/tableau-data.webp b/docs/en/10-third-party/05-bi/tableau/tableau-data.webp
new file mode 100644
index 0000000000..03c82ab7bc
Binary files /dev/null and b/docs/en/10-third-party/05-bi/tableau/tableau-data.webp differ
diff --git a/docs/en/10-third-party/05-bi/tableau/tableau-odbc.jpg b/docs/en/10-third-party/05-bi/tableau/tableau-odbc.jpg
deleted file mode 100644
index fe7c03f963..0000000000
Binary files a/docs/en/10-third-party/05-bi/tableau/tableau-odbc.jpg and /dev/null differ
diff --git a/docs/en/10-third-party/05-bi/tableau/tableau-odbc.webp b/docs/en/10-third-party/05-bi/tableau/tableau-odbc.webp
new file mode 100644
index 0000000000..e28116fb47
Binary files /dev/null and b/docs/en/10-third-party/05-bi/tableau/tableau-odbc.webp differ
diff --git a/docs/en/10-third-party/05-bi/tableau/tableau-table.jpg b/docs/en/10-third-party/05-bi/tableau/tableau-table.jpg
deleted file mode 100644
index cb77a54197..0000000000
Binary files a/docs/en/10-third-party/05-bi/tableau/tableau-table.jpg and /dev/null differ
diff --git a/docs/en/10-third-party/05-bi/tableau/tableau-table.webp b/docs/en/10-third-party/05-bi/tableau/tableau-table.webp
new file mode 100644
index 0000000000..18bdf5c196
Binary files /dev/null and b/docs/en/10-third-party/05-bi/tableau/tableau-table.webp differ
diff --git a/docs/en/14-reference/01-components/01-taosd.md b/docs/en/14-reference/01-components/01-taosd.md
index 4527a7fcac..5ce9a40ecb 100644
--- a/docs/en/14-reference/01-components/01-taosd.md
+++ b/docs/en/14-reference/01-components/01-taosd.md
@@ -43,7 +43,7 @@ After modifying configuration file parameters, you need to restart the *taosd* s
|resolveFQDNRetryTime | Cancelled after 3.x |Not supported |Number of retries when FQDN resolution fails|
|timeToGetAvailableConn | Cancelled after 3.3.4.x |Maximum waiting time to get an available connection, range 10-50000000, in milliseconds, default value 500000|
|maxShellConns | Cancelled after 3.x |Supported, effective after restart|Maximum number of connections allowed|
-|maxRetryWaitTime | |Supported, effective after restart|Maximum timeout for reconnection,calculated from the time of retry,range is 0-86400000,in milliseconds, default value 10000|
+|maxRetryWaitTime | |Supported, effective after restart|Maximum timeout for reconnection,calculated from the time of retry,range is 3000-86400000,in milliseconds, default value 10000|
|shareConnLimit |Added in 3.3.4.0 |Supported, effective after restart|Number of requests a connection can share, range 1-512, default value 10|
|readTimeout |Added in 3.3.4.0 |Supported, effective after restart|Minimum timeout for a single request, range 64-604800, in seconds, default value 900|
diff --git a/docs/en/14-reference/01-components/02-taosc.md b/docs/en/14-reference/01-components/02-taosc.md
index 7b8d3ae78c..83cb3d765b 100644
--- a/docs/en/14-reference/01-components/02-taosc.md
+++ b/docs/en/14-reference/01-components/02-taosc.md
@@ -44,6 +44,7 @@ The TDengine client driver provides all the APIs needed for application programm
|enableQueryHb | |Supported, effective immediately |Internal parameter, whether to send query heartbeat messages|
|minSlidingTime | |Supported, effective immediately |Internal parameter, minimum allowable value for sliding|
|minIntervalTime | |Supported, effective immediately |Internal parameter, minimum allowable value for interval|
+|compareAsStrInGreatest | v3.3.6.0 |Supported, effective immediately |When the greatest and least functions have both numeric and string types as parameters, the comparison type conversion rules are as follows: Integer; 1: uniformly converted to string comparison, 0: uniformly converted to numeric type comparison.|
### Writing Related
diff --git a/docs/en/14-reference/02-tools/10-taosbenchmark.md b/docs/en/14-reference/02-tools/10-taosbenchmark.md
index 19f498eab1..338cc74a3d 100644
--- a/docs/en/14-reference/02-tools/10-taosbenchmark.md
+++ b/docs/en/14-reference/02-tools/10-taosbenchmark.md
@@ -371,10 +371,14 @@ Specify the configuration parameters for tag and data columns in `super_tables`
### Query Parameters
-In query scenarios, `filetype` must be set to `query`.
+`filetype` must be set to `query`.
+
+`query_mode` connect method:
+- "taosc": Native.
+- "rest" : RESTful.
+
`query_times` specifies the number of times to run the query, numeric type.
-Query scenarios can control the execution of slow query statements by setting `kill_slow_query_threshold` and `kill_slow_query_interval` parameters, where threshold controls that queries exceeding the specified exec_usec time will be killed by taosBenchmark, in seconds; interval controls the sleep time to avoid continuous slow query CPU consumption, in seconds.
For other common parameters, see [General Configuration Parameters](#general-configuration-parameters)
@@ -382,13 +386,26 @@ For other common parameters, see [General Configuration Parameters](#general-con
Configuration parameters for querying specified tables (can specify supertables, subtables, or regular tables) are set in `specified_table_query`.
- **mixed_query** : Query Mode . "yes" is `Mixed Query`, "no" is `General Query`, default is "no".
- `General Query`:
+ `General Query`:
Each SQL in `sqls` starts `threads` threads to query this SQL, Each thread exits after executing the `query_times` queries, and only after all threads executing this SQL have completed can the next SQL be executed.
The total number of queries(`General Query`) = the number of `sqls` * `query_times` * `threads`
- `Mixed Query`:
+ `Mixed Query`:
All SQL statements in `sqls` are divided into `threads` groups, with each thread executing one group. Each SQL statement needs to execute `query_times` queries.
- The total number of queries(`Mixed Query`) = the number of `sqls` * `query_times`
+ The total number of queries(`Mixed Query`) = the number of `sqls` * `query_times`.
+
+- **batch_query** : Batch query power switch.
+"yes": indicates that it is enabled.
+"no": indicates that it is not enabled, and other values report errors.
+Batch query refers to dividing all SQL statements in SQL into `threads` groups, with each thread executing one group.
+Each SQL statement is queried only once before exiting, and the main thread waits for all threads to complete before determining if the `query_interval` parameter is set. If sleep is required for a specified time, each thread group is restarted and the previous process is repeated until the number of queries is exhausted.
+Functional limitations:
+- Only supports scenarios where `mixed_query` is set to 'yes'.
+- Restful queries are not supported, meaning `query_made` cannot be 'rest'.
+
- **query_interval** : Query interval, in millisecond, default is 0.
+When the 'batch_query' switch is turned on, it indicates the interval time after each batch query is completed, When closed, it indicates the interval time between each SQL query completion.
+If the execution time of the query exceeds the interval time, it will no longer wait. If the execution time of the query is less than the interval time, it is necessary to wait to make up for the interval time.
+
- **threads** : Number of threads executing the SQL query, default is 1.
- **sqls**:
- **sql**: The SQL command to execute, required.
diff --git a/docs/en/14-reference/03-taos-sql/10-function.md b/docs/en/14-reference/03-taos-sql/10-function.md
index 7875501e7e..993b1176fe 100644
--- a/docs/en/14-reference/03-taos-sql/10-function.md
+++ b/docs/en/14-reference/03-taos-sql/10-function.md
@@ -124,7 +124,39 @@ FLOOR(expr)
```
**Function Description**: Gets the floor of the specified field.
- Other usage notes see CEIL function description.
+ Other usage notes see [CEIL](#ceil) function description.
+
+#### GREATEST
+```sql
+GREATEST(expr1, expr2[, expr]...)
+```
+
+**Function Description**: Get the maximum value of all input parameters. The minimum number of parameters for this function is 2.
+
+**Version**：ver-3.3.6.0
+
+**Return Type**：Refer to the comparison rules. The comparison type is the final return type.
+
+**Applicable Data Types**:
+- Numeric types: timestamp, bool, integer and floating point types
+- Strings types: nchar and varchar types.
+
+**Comparison rules**: The following rules describe the conversion method of the comparison operation:
+- If any parameter is NULL, the comparison result is NULL.
+- If all parameters in the comparison operation are string types, compare them as string types
+- If all parameters are numeric types, compare them as numeric types.
+- If there are both string types and numeric types in the parameters, according to the `compareAsStrInGreatest` configuration item, they are uniformly compared as strings or numeric values. By default, they are compared as strings.
+- In all cases, when different types are compared, the comparison type will choose the type with a larger range for comparison. For example, when comparing integer types, if there is a BIGINT type, BIGINT will definitely be selected as the comparison type.
+
+**Related configuration items**: Client configuration, compareAsStrInGreatest is 1, which means that both string types and numeric types are converted to string comparisons, and 0 means that they are converted to numeric types. The default is 1.
+
+
+#### LEAST
+```sql
+LEAST(expr1, expr2[, expr]...)
+```
+
+**Function Description**：Get the minimum value of all input parameters. The rest of the description is the same as the [GREATEST](#greatest) function.
#### LOG
diff --git a/docs/en/26-tdinternal/09-stream.md b/docs/en/26-tdinternal/09-stream.md
index 2c8d41cccb..69424652dc 100644
--- a/docs/en/26-tdinternal/09-stream.md
+++ b/docs/en/26-tdinternal/09-stream.md
@@ -94,7 +94,7 @@ The sink task is responsible for receiving the output results from the agg task
The above three types of tasks each play their roles in the stream computing architecture, distributed at different levels. Clearly, the number of source tasks directly depends on the number of vnodes, with each source task independently handling the data in its vnode without interference from other source tasks, and there are no sequential constraints. However, it is worth noting that if the final stream computing results converge to one table, then only one sink task will be deployed on the vnode where that table is located. The collaborative relationship between these three types of tasks is shown in the following diagram, together forming the complete execution process of stream computing tasks.
-
+
Figure 3. Relationships between tasks
diff --git a/docs/en/27-train-faq/02-dst.md b/docs/en/27-train-faq/02-dst.md
new file mode 100644
index 0000000000..6fda8f8a16
--- /dev/null
+++ b/docs/en/27-train-faq/02-dst.md
@@ -0,0 +1,293 @@
+---
+title: DST(Daylight Saving Time) Usage
+description: Explanation and suggestions for using DST(Daylight Saving Time) in TDengine
+---
+
+## Background
+
+In the use of time-series databases, there are times when Daylight Saving Time (DST) is encountered. We analyze and explain the use and issues of DST in TDengine to help you use TDengine more smoothly.
+
+## Definitions
+
+### Time Zone
+
+A time zone is a region on Earth that uses the same standard time. Due to the Earth's rotation, to ensure that the time in each place is coordinated with the local sunrise and sunset, the world is divided into multiple time zones.
+
+### IANA Time Zone
+
+The IANA (Internet Assigned Numbers Authority) time zone database, also known as the tz database, provides a standard reference for global time zone information. It is the basis for modern systems and software to handle time zone-related operations.
+
+IANA uses the "Region/City" format (e.g., Europe/Berlin) to clearly identify time zones.
+
+TDengine supports the use of IANA time zones in different components (except for the time zone settings in Windows taos.cfg).
+
+### Standard Time and Local Time
+
+Standard time is the time determined based on a fixed meridian on Earth. It provides a unified reference point for each time zone.
+
+- Greenwich Mean Time (GMT): Historically used reference time, located at the 0° meridian.
+- Coordinated Universal Time (UTC): The modern time standard, similar to GMT but more precise.
+
+The relationship between standard time and time zones is as follows:
+
+- Reference: Standard time (e.g., UTC) is the reference point for setting time zones.
+- Offset: Different time zones are defined by their offset from standard time. For example, UTC+1 means 1 hour ahead of UTC.
+- Regional Division: The world is divided into multiple time zones, each using one or more standard times.
+
+Relative to standard time, each region sets its local time based on its time zone:
+
+- Time Zone Offset: Local time equals standard time plus the offset of the time zone. For example, UTC+2 means 2 hours ahead of UTC.
+- Daylight Saving Time (DST): Some regions adjust their local time during specific periods, such as moving the clock forward by one hour. See the next section for details.
+
+### Daylight Saving Time
+
+Daylight Saving Time (DST) is a system that advances the time by one hour to make better use of daylight and save energy. It usually starts in spring and ends in autumn. The specific start and end times of DST vary by region. The following explanation uses Berlin time as an example to illustrate DST and its effects.
+
+
+
+According to this rule, you can see:
+
+- The time between 02:00:00 and 03:00:00 (excluding 03:00:00) on March 31, 2024, in Berlin local time does not exist (jump).
+- The time between 02:00:00 and 03:00:00 (excluding 03:00:00) on October 27, 2024, in Berlin local time appears twice.
+
+#### DST and the IANA Time Zone Database
+
+- Recording Rules: The IANA time zone database records detailed DST rules for each region, including the start and end dates and times.
+- Automatic Adjustment: Many operating systems and software use the IANA database to automatically handle DST adjustments.
+- Historical Changes: The IANA database also tracks historical DST changes to ensure accuracy.
+
+#### DST and Timestamp Conversion
+
+- Converting a timestamp to local time is deterministic. For example, 1729990654 is Berlin time DST 2024-10-27 02:57:34, and 1729994254 is Berlin time standard time 2024-10-27 02:57:34 (these two local times are the same except for the time offset).
+- Without specifying the time offset, converting local time to a timestamp is indeterminate. The time skipped during DST does not exist and cannot be converted to a timestamp, such as Berlin time 2024-03-31 02:34:56 does not exist and cannot be converted to a timestamp. The repeated time during the end of DST cannot determine which timestamp it is, such as 2024-10-27 02:57:34 without specifying the time offset cannot determine whether it is 1729990654 or 1729994254. Specifying the time offset can determine the timestamp, such as 2024-10-27 02:57:34 CEST(+02:00), specifying DST 2024-10-27 02:57:34 timestamp 1729990654.
+
+### RFC3339 Time Format
+
+RFC 3339 is an internet time format standard used to represent dates and times. It is based on the ISO 8601 standard but specifies some format details more specifically.
+
+The format is as follows:
+
+- Basic Format: `YYYY-MM-DDTHH:MM:SSZ`
+- Time Zone Representation:
+ - Z represents Coordinated Universal Time (UTC).
+ - Offset format, such as +02:00, represents the time difference from UTC.
+
+With explicit time zone offsets, the RFC 3339 format can accurately parse and compare times globally.
+
+The advantages of RFC 3339 include:
+
+- Standardization: Provides a unified format for easy cross-system data exchange.
+- Clarity: Clearly indicates time zone information, avoiding time misunderstandings.
+
+TDengine uses the RFC3339 format for display in REST API and Explorer UI. In SQL statements, you can use the RFC3339 format to write timestamp data:
+
+```sql
+insert into t1 values('2024-10-27T01:59:59.000Z', 0);
+select * from t1 where ts >= '2024-10-27T01:59:59.000Z';
+```
+
+### Undefined Behavior
+
+Undefined behavior refers to specific code or operations that do not have a clearly defined result and do not guarantee compatibility with that result. TDengine may modify the current behavior in a future version without notifying users. Therefore, users should not rely on the current undefined behavior for judgment or application in TDengine.
+
+## Writing and Querying DST in TDengine
+
+We use the following table to show the impact of DST on writing and querying.
+
+
+
+### Table Explanation
+
+- **TIMESTAMP**: TDengine uses a 64-bit integer to store raw timestamps.
+- **UTC**: The UTC time representation corresponding to the timestamp.
+- **Europe/Berlin**: The RFC3339 format time corresponding to the Europe/Berlin time zone.
+- **Local**: The local time corresponding to the Europe/Berlin time zone (without time zone).
+
+### Table Analysis
+
+- At the **start of DST** (Berlin time March 31, 02:00), the time jumps directly from 02:00 to 03:00 (one hour forward).
+ - Light green is the timestamp one hour before the start of DST;
+ - Dark green is the timestamp one hour after the start of DST;
+ - Red indicates that the nonexistent local time was inserted into the TDengine database:
+ - Using SQL `INSERT INTO t1 values('2024-03-31 02:59:59',..)` to insert data from `2024-03-31 02:00:00` to `2024-03-31 02:59:59` will be automatically adjusted to -1000 (in TDengine, this is undefined behavior, currently this value is related to the database precision, millisecond database is -1000, microsecond database is -1000000, nanosecond database is -1000000000), because that moment does not exist in local time;
+- At the **end of DST** (Berlin time October 27, 03:00), the time jumps from 03:00 to 02:00 (one hour back).
+ - Light blue indicates the timestamp one hour before the clock jump;
+ - Dark blue indicates the timestamp within one hour after the clock jump, its local time without time zone is the same as the previous hour.
+ - Purple indicates the timestamp one hour after the clock jump;
+- **Local Time Changes**: It can be seen that due to the adjustment of DST, local time changes, which may cause some time periods to appear repeated or missing.
+- **UTC Time Unchanged**: UTC time remains unchanged, ensuring the consistency and order of time.
+- **RFC3339**: The RFC3339 format time shows the change in time offset, changing to +02:00 after the start of DST and to +01:00 after the end of DST.
+- **Conditional Query**:
+ - At the **start of DST**, the skipped time (`[03-31 02:00:00,03-31 03:00:00)`) does not exist, so using that time for queries results in undefined behavior: `SELECT ts FROM t1 WHERE ts BETWEEN '2024-03-31 02:00:00' AND '2024-03-31 02:59:59'` (the nonexistent local timestamp is converted to `-1000`):
+
+ ```sql
+ taos> SELECT ts FROM t1 WHERE ts BETWEEN '2024-03-31 02:00:00' AND '2024-03-31 02:59:59';
+ ts |
+ =================
+ -1000 |
+ Query OK, 1 row(s) in set (0.003635s)
+ ```
+
+ When the nonexistent timestamp is used together with the existing timestamp, the result is also not as expected, as shown below where the start local time does not exist:
+
+ ```sql
+ taos> SELECT ts, to_iso8601(ts,'Z') FROM t1 WHERE ts BETWEEN '2024-03-31 02:00:00' AND '2024-03-31 03:59:59';
+ ts | to_iso8601(ts,'Z') |
+ ==================================================
+ -1000 | 1969-12-31T23:59:59.000Z |
+ 1711843200000 | 2024-03-31T00:00:00.000Z |
+ 1711846799000 | 2024-03-31T00:59:59.000Z |
+ 1711846800000 | 2024-03-31T01:00:00.000Z |
+ 1711846801000 | 2024-03-31T01:00:01.000Z |
+ Query OK, 5 row(s) in set (0.003339s)
+ ```
+
+ In the following statements, the first SQL query end time does not exist, and the second end time exists. The first SQL query result is not as expected:
+
+ ```sql
+ taos> SELECT ts, to_iso8601(ts,'Z') FROM t1 WHERE ts BETWEEN '2024-03-31 01:00:00' AND '2024-03-31 02:00:00';
+ Query OK, 0 row(s) in set (0.000930s)
+
+ taos> SELECT ts, to_iso8601(ts,'Z') FROM t1 WHERE ts BETWEEN '2024-03-31 01:00:00' AND '2024-03-31 01:59:59';
+ ts | to_iso8601(ts,'Z') |
+ ==================================================
+ 1711843200000 | 2024-03-31T00:00:00.000Z |
+ 1711846799000 | 2024-03-31T00:59:59.000Z |
+ Query OK, 2 row(s) in set (0.001227s)
+ ```
+
+ - At the end of DST, the repeated time (`[10-27 02:00:00,10-27 03:00:00)` excluding `10-27 03:00:00`) appears twice, and using that time range for queries in TDengine is also undefined behavior.
+ - Querying the data between `[2024-10-27 02:00:00, 2024-10-27 03:00:00]` includes the repeated timestamps and the data at `2024-10-27 03:00:00`:
+
+ ```sql
+ taos> SELECT ts, to_iso8601(ts,'Z'), TO_CHAR(ts, 'YYYY-MM-DD HH:mi:ss') FROM t1 WHERE ts BETWEEN '2024-10-27 02:00:00' AND '2024-10-27 03:00:00';
+ ts | to_iso8601(ts,'Z') | to_char(ts, 'YYYY-MM-DD HH:mi:ss') |
+ =======================================================================================
+ 1729987200000 | 2024-10-27T00:00:00.000Z | 2024-10-27 02:00:00 |
+ 1729990799000 | 2024-10-27T00:59:59.000Z | 2024-10-27 02:59:59 |
+ 1729990800000 | 2024-10-27T01:00:00.000Z | 2024-10-27 02:00:00 |
+ 1729994399000 | 2024-10-27T01:59:59.000Z | 2024-10-27 02:59:59 |
+ 1729994400000 | 2024-10-27T02:00:00.000Z | 2024-10-27 03:00:00 |
+ Query OK, 5 row(s) in set (0.001370s)
+ ```
+
+ - However, the following query for the range [2024-10-27 02:00:00.000,2024-10-27 02:57:34.999] can only find the data at the first 2024-10-27 02:00:00 time point:
+
+ ```sql
+ taos> SELECT ts, to_iso8601(ts,'Z'), TO_CHAR(ts, 'YYYY-MM-DD HH:mi:ss') FROM t1 WHERE ts >= '2024-10-27 02:00:00' AND ts <= '2024-10-27 02:57:00.999';
+ ts | to_iso8601(ts,'Z') | to_char(ts, 'YYYY-MM-DD HH:mi:ss') |
+ =======================================================================================
+ 1729987200000 | 2024-10-27T00:00:00.000Z | 2024-10-27 02:00:00 |
+ Query OK, 1 row(s) in set (0.004480s)
+ ```
+
+ - The following query for the range [2024-10-27 02:00:01,2024-10-27 02:57:35] can find 3 rows of data (including one row of local time data at 02:59:59):
+
+ ```sql
+ taos> SELECT ts, to_iso8601(ts,'Z'), TO_CHAR(ts, 'YYYY-MM-DD HH:mi:ss') FROM t1 WHERE ts >= '2024-10-27 02:00:00' AND ts <= '2024-10-27 02:57:35';;
+ ts | to_iso8601(ts,'Z') | to_char(ts, 'YYYY-MM-DD HH:mi:ss') |
+ ===============================================================================================
+ 2024-10-27 02:00:00.000 | 2024-10-27T00:00:00.000Z | 2024-10-27 02:00:00 |
+ 2024-10-27 02:59:59.000 | 2024-10-27T00:59:59.000Z | 2024-10-27 02:59:59 |
+ 2024-10-27 02:00:00.000 | 2024-10-27T01:00:00.000Z | 2024-10-27 02:00:00 |
+ Query OK, 3 row(s) in set (0.004428s)
+ ```
+
+## Summary and Suggestions
+
+### Summary
+
+This explanation only addresses the impact of using local time. Using UNIX timestamps or RFC3339 has no impact.
+
+- Writing:
+ - It is not possible to write data for nonexistent times during the DST transition.
+ - Writing data for repeated times during the DST transition is undefined behavior.
+- Querying:
+ - Querying with conditions that specify the skipped time during the start of DST results in undefined behavior.
+ - Querying with conditions that specify the repeated time during the end of DST results in undefined behavior.
+- Display:
+ - Displaying with time zones is not affected.
+ - Displaying local time is accurate, but repeated times during the end of DST cannot be distinguished.
+ - Users should be cautious when using time without time zones for display and application.
+
+### Suggestions
+
+To avoid unnecessary impacts of DST on querying and writing in TDengine, it is recommended to use explicit time offsets for writing and querying.
+
+- Use UNIX Timestamps: Using UNIX timestamps can avoid time zone issues.
+
+ | TIMESTAMP | UTC | Europe/Berlin | Local |
+ | ------------: | :----------------------: | :---------------------------: | :-----------------: |
+ | 1711846799000 | 2024-03-31T00:59:59.000Z | 2024-03-31T01:59:59.000+01:00 | 2024-03-31 01:59:59 |
+ | 1711846800000 | 2024-03-31T01:00:00.000Z | 2024-03-31T03:00:00.000+02:00 | 2024-03-31 03:00:00 |
+
+ ```sql
+ taos> insert into t1 values(1711846799000, 1)(1711846800000, 2);
+ Insert OK, 2 row(s) affected (0.001434s)
+
+ taos> select * from t1 where ts between 1711846799000 and 1711846800000;
+ ts | v1 |
+ ===============================
+ 1711846799000 | 1 |
+ 1711846800000 | 2 |
+ Query OK, 2 row(s) in set (0.003503s)
+ ```
+
+- Use RFC3339 Time Format: The RFC3339 time format with time zone offsets can effectively avoid the uncertainty of DST.
+
+ | TIMESTAMP | UTC | Europe/Berlin | Local |
+ | ------------: | :----------------------: | :---------------------------: | :-----------------: |
+ | 1729987200000 | 2024-10-27T00:00:00.000Z | 2024-10-27T02:00:00.000+02:00 | 2024-10-27 02:00:00 |
+ | 1729990799000 | 2024-10-27T00:59:59.000Z | 2024-10-27T02:59:59.000+02:00 | 2024-10-27 02:59:59 |
+ | 1729990800000 | 2024-10-27T01:00:00.000Z | 2024-10-27T02:00:00.000+01:00 | 2024-10-27 02:00:00 |
+ | 1729994399000 | 2024-10-27T01:59:59.000Z | 2024-10-27T02:59:59.000+01:00 | 2024-10-27 02:59:59 |
+
+ ```sql
+ taos> insert into t1 values ('2024-10-27T02:00:00.000+02:00', 1)
+ ('2024-10-27T02:59:59.000+02:00', 2)
+ ('2024-10-27T02:00:00.000+01:00', 3)
+ ('2024-10-27T02:59:59.000+01:00', 4);
+ Insert OK, 4 row(s) affected (0.001514s)
+
+ taos> SELECT *,
+ to_iso8601(ts,'Z'),
+ to_char(ts, 'YYYY-MM-DD HH:mi:ss') FROM t1
+ WHERE ts >= '2024-10-27T02:00:00.000+02:00'
+ AND ts <= '2024-10-27T02:59:59.000+01:00';
+ ts | v1 | to_iso8601(ts,'Z') | to_char(ts, 'YYYY-MM-DD HH:mi:ss') |
+ =====================================================================================================
+ 1729987200000 | 1 | 2024-10-27T00:00:00.000Z | 2024-10-27 02:00:00 |
+ 1729990799000 | 2 | 2024-10-27T00:59:59.000Z | 2024-10-27 02:59:59 |
+ 1729990800000 | 3 | 2024-10-27T01:00:00.000Z | 2024-10-27 02:00:00 |
+ 1729994399000 | 4 | 2024-10-27T01:59:59.000Z | 2024-10-27 02:59:59 |
+ Query OK, 4 row(s) in set (0.004275s)
+
+ taos> SELECT *,
+ to_iso8601(ts,'Z'),
+ to_char(ts, 'YYYY-MM-DD HH:mi:ss') FROM t1
+ WHERE ts >= '2024-10-27T02:00:00.000+02:00'
+ AND ts <= '2024-10-27T02:59:59.000+02:00';
+ ts | v1 | to_iso8601(ts,'Z') | to_char(ts, 'YYYY-MM-DD HH:mi:ss') |
+ =====================================================================================================
+ 1729987200000 | 1 | 2024-10-27T00:00:00.000Z | 2024-10-27 02:00:00 |
+ 1729990799000 | 2 | 2024-10-27T00:59:59.000Z | 2024-10-27 02:59:59 |
+ Query OK, 2 row(s) in set (0.004275s)
+ ```
+
+- Pay Attention to Time Zone Settings When Querying: When querying and displaying, if local time is needed, be sure to consider the impact of DST.
+ - taosAdapter: When using the REST API, it supports setting the IANA time zone, and the result is returned in RFC3339 format.
+
+ ```shell
+ $ curl -uroot:taosdata 'localhost:6041/rest/sql?tz=Europe/Berlin'\
+ -d "select ts from tz1.t1"
+ {"code":0,"column_meta":[["ts","TIMESTAMP",8]],"data":[["1970-01-01T00:59:59.000+01:00"],["2024-03-31T01:00:00.000+01:00"],["2024-03-31T01:59:59.000+01:00"],["2024-03-31T03:00:00.000+02:00"],["2024-03-31T03:00:01.000+02:00"],["2024-10-27T02:00:00.000+02:00"],["2024-10-27T02:59:59.000+02:00"],["2024-10-27T02:00:00.000+01:00"],["2024-10-27T02:59:59.000+01:00"],["2024-10-27T03:00:00.000+01:00"]],"rows":10}
+ ```
+
+ - Explorer: When using the Explorer page for SQL queries, users can configure the client time zone to display in RFC3339 format.
+
+ 
+
+## Reference Documents
+
+- IANA Time Zone Database: [https://www.iana.org/time-zones](https://www.iana.org/time-zones)
+- RFC3339: [https://datatracker.ietf.org/doc/html/rfc3339](https://datatracker.ietf.org/doc/html/rfc3339)
diff --git a/docs/en/27-train-faq/02-dst/dst-berlin.png b/docs/en/27-train-faq/02-dst/dst-berlin.png
new file mode 100644
index 0000000000..fa1125de25
Binary files /dev/null and b/docs/en/27-train-faq/02-dst/dst-berlin.png differ
diff --git a/docs/en/27-train-faq/02-dst/dst-table.png b/docs/en/27-train-faq/02-dst/dst-table.png
new file mode 100644
index 0000000000..f5eddbe010
Binary files /dev/null and b/docs/en/27-train-faq/02-dst/dst-table.png differ
diff --git a/docs/en/27-train-faq/02-dst/explorer-with-tz.png b/docs/en/27-train-faq/02-dst/explorer-with-tz.png
new file mode 100644
index 0000000000..95758f117a
Binary files /dev/null and b/docs/en/27-train-faq/02-dst/explorer-with-tz.png differ
diff --git a/docs/en/assets/architecture-01.png b/docs/en/assets/architecture-01.png
index a9e2bf9f70..71f6b06f5a 100644
Binary files a/docs/en/assets/architecture-01.png and b/docs/en/assets/architecture-01.png differ
diff --git a/docs/en/assets/architecture-02.png b/docs/en/assets/architecture-02.png
index e558a830ae..92580995c1 100644
Binary files a/docs/en/assets/architecture-02.png and b/docs/en/assets/architecture-02.png differ
diff --git a/docs/en/assets/architecture-03.png b/docs/en/assets/architecture-03.png
index 467580248c..60d786a782 100644
Binary files a/docs/en/assets/architecture-03.png and b/docs/en/assets/architecture-03.png differ
diff --git a/docs/en/assets/architecture-04.png b/docs/en/assets/architecture-04.png
index e034f97f89..06ecf72a26 100644
Binary files a/docs/en/assets/architecture-04.png and b/docs/en/assets/architecture-04.png differ
diff --git a/docs/en/assets/data-compression-01.png b/docs/en/assets/data-compression-01.png
index 64a36f4a42..31abb35926 100644
Binary files a/docs/en/assets/data-compression-01.png and b/docs/en/assets/data-compression-01.png differ
diff --git a/docs/en/assets/data-querying-01.png b/docs/en/assets/data-querying-01.png
index 381d6ec88e..36cc854fe2 100644
Binary files a/docs/en/assets/data-querying-01.png and b/docs/en/assets/data-querying-01.png differ
diff --git a/docs/en/assets/data-querying-03.png b/docs/en/assets/data-querying-03.png
index 416a14a0a9..b1f4024322 100644
Binary files a/docs/en/assets/data-querying-03.png and b/docs/en/assets/data-querying-03.png differ
diff --git a/docs/en/assets/data-querying-04.png b/docs/en/assets/data-querying-04.png
index fc83f00193..a249dac3c3 100644
Binary files a/docs/en/assets/data-querying-04.png and b/docs/en/assets/data-querying-04.png differ
diff --git a/docs/en/assets/data-subscription-engine-01.png b/docs/en/assets/data-subscription-engine-01.png
index d9306cdb74..088d0070be 100644
Binary files a/docs/en/assets/data-subscription-engine-01.png and b/docs/en/assets/data-subscription-engine-01.png differ
diff --git a/docs/en/assets/data-subscription-engine-02.png b/docs/en/assets/data-subscription-engine-02.png
index 0c9a061107..0bbd9ff0af 100644
Binary files a/docs/en/assets/data-subscription-engine-02.png and b/docs/en/assets/data-subscription-engine-02.png differ
diff --git a/docs/en/assets/data-subscription-engine-03.png b/docs/en/assets/data-subscription-engine-03.png
index 0ddb005d66..df61f32208 100644
Binary files a/docs/en/assets/data-subscription-engine-03.png and b/docs/en/assets/data-subscription-engine-03.png differ
diff --git a/docs/en/assets/data-subscription-engine-04.png b/docs/en/assets/data-subscription-engine-04.png
index 1bb4bb3014..921d6d7de6 100644
Binary files a/docs/en/assets/data-subscription-engine-04.png and b/docs/en/assets/data-subscription-engine-04.png differ
diff --git a/docs/en/assets/data-subscription-engine-05.png b/docs/en/assets/data-subscription-engine-05.png
index fbc2147c91..5e7867170c 100644
Binary files a/docs/en/assets/data-subscription-engine-05.png and b/docs/en/assets/data-subscription-engine-05.png differ
diff --git a/docs/en/assets/data-subscription-engine-06.png b/docs/en/assets/data-subscription-engine-06.png
index dd2b472890..256c6abc9c 100644
Binary files a/docs/en/assets/data-subscription-engine-06.png and b/docs/en/assets/data-subscription-engine-06.png differ
diff --git a/docs/en/assets/data-subscription-engine-07.png b/docs/en/assets/data-subscription-engine-07.png
index 6cd1670b64..978fa022ee 100644
Binary files a/docs/en/assets/data-subscription-engine-07.png and b/docs/en/assets/data-subscription-engine-07.png differ
diff --git a/docs/en/assets/mqtt-05.png b/docs/en/assets/mqtt-05.png
index 5345b3923f..5644330e14 100644
Binary files a/docs/en/assets/mqtt-05.png and b/docs/en/assets/mqtt-05.png differ
diff --git a/docs/en/assets/query-engine-01.png b/docs/en/assets/query-engine-01.png
index 08d42dc038..da850c3116 100644
Binary files a/docs/en/assets/query-engine-01.png and b/docs/en/assets/query-engine-01.png differ
diff --git a/docs/en/assets/query-engine-02.png b/docs/en/assets/query-engine-02.png
index ae7ab92c0a..dcb5360f62 100644
Binary files a/docs/en/assets/query-engine-02.png and b/docs/en/assets/query-engine-02.png differ
diff --git a/docs/en/assets/storage-engine-01.png b/docs/en/assets/storage-engine-01.png
index 40cba22780..f5cc5867bc 100644
Binary files a/docs/en/assets/storage-engine-01.png and b/docs/en/assets/storage-engine-01.png differ
diff --git a/docs/en/assets/storage-engine-02.png b/docs/en/assets/storage-engine-02.png
index c6ff24bccb..f201b4dbc4 100644
Binary files a/docs/en/assets/storage-engine-02.png and b/docs/en/assets/storage-engine-02.png differ
diff --git a/docs/en/assets/storage-engine-03.png b/docs/en/assets/storage-engine-03.png
index fdc252a4ab..d083906367 100644
Binary files a/docs/en/assets/storage-engine-03.png and b/docs/en/assets/storage-engine-03.png differ
diff --git a/docs/en/assets/storage-engine-04.png b/docs/en/assets/storage-engine-04.png
index 606bd4eaeb..d265fcd6a7 100644
Binary files a/docs/en/assets/storage-engine-04.png and b/docs/en/assets/storage-engine-04.png differ
diff --git a/docs/en/assets/storage-engine-05.png b/docs/en/assets/storage-engine-05.png
index 4211ac2343..36febdfc85 100644
Binary files a/docs/en/assets/storage-engine-05.png and b/docs/en/assets/storage-engine-05.png differ
diff --git a/docs/en/assets/storage-engine-06.png b/docs/en/assets/storage-engine-06.png
index d310929b31..4f8eaa1547 100644
Binary files a/docs/en/assets/storage-engine-06.png and b/docs/en/assets/storage-engine-06.png differ
diff --git a/docs/en/assets/storage-engine-07.png b/docs/en/assets/storage-engine-07.png
index 7c82e017e9..bfbf0c03d3 100644
Binary files a/docs/en/assets/storage-engine-07.png and b/docs/en/assets/storage-engine-07.png differ
diff --git a/docs/en/assets/storage-engine-08.png b/docs/en/assets/storage-engine-08.png
index ecd1262e94..a2c4201fe7 100644
Binary files a/docs/en/assets/storage-engine-08.png and b/docs/en/assets/storage-engine-08.png differ
diff --git a/docs/en/assets/storage-engine-09.png b/docs/en/assets/storage-engine-09.png
index d07acee6ae..304926b04e 100644
Binary files a/docs/en/assets/storage-engine-09.png and b/docs/en/assets/storage-engine-09.png differ
diff --git a/docs/en/assets/storage-engine-10.png b/docs/en/assets/storage-engine-10.png
index 475dbae2fb..deba103a86 100644
Binary files a/docs/en/assets/storage-engine-10.png and b/docs/en/assets/storage-engine-10.png differ
diff --git a/docs/en/assets/storage-engine-11.png b/docs/en/assets/storage-engine-11.png
index 4d942ad728..43a3d625c8 100644
Binary files a/docs/en/assets/storage-engine-11.png and b/docs/en/assets/storage-engine-11.png differ
diff --git a/docs/en/assets/stream-processing-engine-01.png b/docs/en/assets/stream-processing-engine-01.png
index c8a8087273..407eb3c542 100644
Binary files a/docs/en/assets/stream-processing-engine-01.png and b/docs/en/assets/stream-processing-engine-01.png differ
diff --git a/docs/en/assets/stream-processing-engine-02.png b/docs/en/assets/stream-processing-engine-02.png
index 16c3be56b9..04ecf582de 100644
Binary files a/docs/en/assets/stream-processing-engine-02.png and b/docs/en/assets/stream-processing-engine-02.png differ
diff --git a/docs/en/assets/stream-processing-engine-03.png b/docs/en/assets/stream-processing-engine-03.png
index d9fae4908d..138f4eda39 100644
Binary files a/docs/en/assets/stream-processing-engine-03.png and b/docs/en/assets/stream-processing-engine-03.png differ
diff --git a/docs/zh/05-basic/03-query.md b/docs/zh/05-basic/03-query.md
index 0b2f290667..52b825c47c 100644
--- a/docs/zh/05-basic/03-query.md
+++ b/docs/zh/05-basic/03-query.md
@@ -4,6 +4,10 @@ title: TDengine 数据查询
toc_max_heading_level: 4
---
+import win from './window.png';
+import swin from './session-window.png';
+import ewin from './event-window.png';
+
相较于其他众多时序数据库和实时数据库，TDengine 的一个独特优势在于，自其首个版本发布之初便支持标准的 SQL 查询功能。这一特性极大地降低了用户在使用过程中的学习难度。本章将以智能电表的数据模型为例介绍如何在 TDengine 中运用 SQL 查询来处理时序数据。如果需要进一步了解 SQL 语法的细节和功能，建议参阅 TDengine 的官方文档。通过本章的学习，你将能够熟练掌握 TDengine 的 SQL 查询技巧，进而高效地对时序数据进行操作和分析。
## 基本查询
@@ -136,16 +140,15 @@ Query OK, 10 row(s) in set (2.415961s)
在 TDengine 中，你可以使用窗口子句来实现按时间窗口切分方式进行聚合结果查询，这种查询方式特别适用于需要对大量时间序列数据进行分析的场景，例如智能电表每 10s 采集一次数据，但需要查询每隔 1min 的温度平均值。
-窗口子句允许你针对查询的数据集合按照窗口进行切分，并对每个窗口内的数据进行聚合，包含：
-- 时间窗口（time window）
-- 状态窗口（status window）
-- 会话窗口（session window）
-- 事件窗口（event window）
-- 计数窗口（count window）
+窗口子句允许你针对查询的数据集合按照窗口进行切分，并对每个窗口内的数据进行聚合。窗口划分逻辑如下图所示。
-窗口划分逻辑如下图所示：
+
-
+- 时间窗口（time window）：根据时间间隔划分数据，支持滑动时间窗口和翻转时间窗口，适用于按固定时间周期进行数据聚合。
+- 状态窗口（status window）：基于设备状态值的变化划分窗口，相同状态值的数据归为一个窗口，状态值改变时窗口关闭。
+- 会话窗口（session window）：根据记录的时间戳差异划分会话，时间戳间隔小于预设值的记录属于同一会话。
+- 事件窗口（event window）：基于事件的开始条件和结束条件动态划分窗口，满足开始条件时窗口开启，满足结束条件时窗口关闭。
+- 计数窗口（count window）：根据数据行数划分窗口，每达到指定行数即为一个窗口，并进行聚合计算。
窗口子句语法如下：
@@ -408,7 +411,8 @@ Query OK, 22 row(s) in set (0.153403s)
会话窗口根据记录的时间戳主键的值来确定是否属于同一个会话。如下图所示，如果设置时间戳的连续的间隔小于等于 12 秒，则以下 6 条记录构成 2 个会话窗口，分别是：[2019-04-28 14:22:10，2019-04-28 14:22:30] 和 [2019-04-28 14:23:10，2019-04-28 14:23:30]。因为 2019-04-28 14:22:30 与 2019-04-28 14:23:10 之间的时间间隔是 40 秒，超过了连续时间间隔（12 秒）。
-
+
+
在 tol_value 时间间隔范围内的结果都认为归属于同一个窗口，如果连续的两条记录的时间超过 tol_val，则自动开启下一个窗口。
@@ -461,7 +465,7 @@ Query OK, 10 row(s) in set (0.043489s)
select _wstart, _wend, count(*) from t event_window start with c1 > 0 end with c2 < 10
```
-
+
示例 SQL:
diff --git a/docs/zh/05-basic/event-window.png b/docs/zh/05-basic/event-window.png
index 3a2a628ffe..a249dac3c3 100644
Binary files a/docs/zh/05-basic/event-window.png and b/docs/zh/05-basic/event-window.png differ
diff --git a/docs/zh/05-basic/session-window.png b/docs/zh/05-basic/session-window.png
index 416a14a0a9..b1f4024322 100644
Binary files a/docs/zh/05-basic/session-window.png and b/docs/zh/05-basic/session-window.png differ
diff --git a/docs/zh/05-basic/window.png b/docs/zh/05-basic/window.png
index 5e3efb8a3b..a6f5883917 100644
Binary files a/docs/zh/05-basic/window.png and b/docs/zh/05-basic/window.png differ
diff --git a/docs/zh/06-advanced/06-TDgpt/07-faq.md b/docs/zh/06-advanced/06-TDgpt/07-faq.md
index 9747dc18f4..4cfb5abf06 100644
--- a/docs/zh/06-advanced/06-TDgpt/07-faq.md
+++ b/docs/zh/06-advanced/06-TDgpt/07-faq.md
@@ -3,7 +3,12 @@ title: "常见问题"
sidebar_label: "常见问题"
---
-1. 创建 anode 失败，返回指定服务无法访问
+### 1. 安装过程中编译 uWSGI 失败，如何处理
+TDgpt 安装过程中需要在本地编译 uWSGI，某些环境的 Python（例如：anaconda）安装 uWSGI 会出现冲突导致编译失败，安装流程因此无法继续下去。这种情况下可以尝试在安装过程中忽略 uWSGI的安装。
+由于忽略了 uWSGI 安装，后续启动 taosasnode 服务的时候，需要手动输入命令进行启动 `python3.10 /usr/local/taos/taosanode/lib/taosanalytics/app.py` 。 执行该命令的时候请确保使用了虚拟环境中的 Python 程序才能加载依赖库。
+
+
+### 2. 创建 anode 失败，返回指定服务无法访问
```bash
taos> create anode '127.0.0.1:6090';
@@ -26,7 +31,7 @@ curl: (7) Failed to connect to 127.0.0.1 port 6090: Connection refused
>请勿使用 systemctl status taosanode 检查 taosanode 是否正常
-2. 服务正常，查询过程返回服务不可用
+### 3. 服务正常，查询过程返回服务不可用
```bash
taos> select _frowts,forecast(current, 'algo=arima, alpha=95, wncheck=0, rows=20') from d1 where ts<='2017-07-14 10:40:09.999';
@@ -34,7 +39,7 @@ DB error: Analysis service can't access[0x80000441] (60.195613s)
```
数据分析默认超时时间是 60s，出现这个问题的原因是输入数据分析过程超过默认的最长等待时间，请尝试采用限制数据输入范围的方式将输入数据规模减小或者更换分析算法再次尝试。
-3. 返回结果出现非法 JSON 格式错误 (Invalid json format)
+### 4. 返回结果出现非法 JSON 格式错误 (Invalid json format)
从 anode 返回到 TDengine 的分析结果有误，请检查 anode 运行日志 `/var/log/taos/taosanode/taosanode.app.log`，以便于获得具体的错误信息。
diff --git a/docs/zh/10-third-party/05-bi/12-tableau.md b/docs/zh/10-third-party/05-bi/12-tableau.md
index 4a22d0f779..b53833debb 100644
--- a/docs/zh/10-third-party/05-bi/12-tableau.md
+++ b/docs/zh/10-third-party/05-bi/12-tableau.md
@@ -26,18 +26,18 @@ Tableau 是一款知名的商业智能工具，它支持多种数据源，可方
**第 3 步**，点击 `DSN` 单选框，接着选择已配置好的数据源(MyTDengine)，然后点击`连接`按钮。待连接成功后，删除字符串附加部分的内容，最后点击`登录`按钮即可。
-
+
## 数据分析
**第 1 步**，在工作簿页面中，选择已连接的数据源。点击数据库的下拉列表，会显示需要进行数据分析的数据库。在此基础上，点击表选项中的查找按钮，即可将该数据库下的所有表显示出来。然后，拖动需要分析的表到右侧区域，即可显示出表结构。
-
+
**第 2 步**，点击下方的"立即更新"按钮，即可将表中的数据展示出来。
-
+
**第 3 步**，点击窗口下方的"工作表"，弹出数据分析窗口， 并展示分析表的所有字段,将字段拖动到行列即可展示出图表。
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/docs/zh/10-third-party/05-bi/13-excel.md b/docs/zh/10-third-party/05-bi/13-excel.md
index bfa6b5b832..06281b88f0 100644
--- a/docs/zh/10-third-party/05-bi/13-excel.md
+++ b/docs/zh/10-third-party/05-bi/13-excel.md
@@ -19,22 +19,22 @@ title: 与 Excel 集成
**第 2 步**，在 Windows 系统环境下启动 Excel，之后选择【数据】->【获取数据】->【自其他源】->【从ODBC】。
-
+
**第 3 步**，在弹出窗口的【数据源名称(DSN)】下拉列表中选择需要连接的数据源后，点击【确定】按钮。
-
+
**第 4 步**，输入 TDengine 的用户名密码。
-
+
**第 5 步**，在弹出的【导航器】对话框中，选择要加载的库表, 并点击【加载】完成数据加载。
-
+
## 数据分析
选中导入的数据，在【插入】选项卡中选择柱状图，并且在右侧的【数据透视图】中配置数据字段。
-
+
diff --git a/docs/zh/10-third-party/05-bi/14-finebi.md b/docs/zh/10-third-party/05-bi/14-finebi.md
new file mode 100644
index 0000000000..5ffa6e76a7
--- /dev/null
+++ b/docs/zh/10-third-party/05-bi/14-finebi.md
@@ -0,0 +1,83 @@
+---
+sidebar_label: FineBI
+title: 与 FineBI 集成
+---
+
+帆软是一家专注于商业智能与数据分析领域的科技企业，凭借自主研发的 FineBI 和 FineReport 两款核心产品在行业内占据重要地位。帆软的 BI 工具广泛应用于各类企业，帮助用户实现数据的可视化分析、报表生成和数据决策支持。
+
+通过使用 `TDengine Java connector` 连接器，FineBI 可以快速访问 TDengine 的数据。用户可以在 FineBI 中直接连接 TDengine 数据库，获取时序数据进行分析并制作可视化报表，整个过程不需要任何代码编写过程。
+
+## 前置条件
+
+准备以下环境：
+
+- TDengine 3.3.4.0 以上版本集群已部署并正常运行（企业及社区版均可）。
+- taosAdapter 能够正常运行，详细参考 [taosAdapter 参考手册](../../../reference/components/taosadapter)。
+- FineBI 安装（如未安装，请下载并安装 [FineBI 下载](https://www.finebi.com/product/download)）。
+- 下载 `fine_conf_entity` 插件用于支持允许添加JDBC驱动, [下载地址](https://market.fanruan.com/plugin/1052a471-0239-4cd8-b832-045d53182c5d)。
+- 安装 JDBC 驱动。从 `maven.org` 下载 `TDengine JDBC` 连接器文件 `taos-jdbcdriver-3.4.0-dist.jar` 或以上版本。
+
+## 配置数据源
+
+**第 1 步**，在 FineBI 服务端 `db.script` 配置文件中，找到 `SystemConfig.driverUpload` 配置项并将其修改为 `true`。
+
+- Windows 系统：配置文件路径是安装目录下 `webapps/webroot/WEB-INF/embed/finedb/db.script`。
+- Liunx/Mac 系统：配置文件路径是 `/usr/local/FineBI6.1/webapps/webroot/WEB-INF/embed/finedb/db.script`。
+
+**第 2 步**，启动 FineBI 服务，在浏览器中输入 `http://ip:37799/webroot/decision`, 其中 ip 是 FineBI 服务端 ip 地址。
+
+**第 3 步**， 打开 FineBI Web 页面登录后，点击【管理系统】->【插件管理】，在右侧的【应用商城】中点击【从本地安装】选择已下载的 `fine_conf_entity` 插件进行安装。
+
+
+
+**第 4 步**，点击【管理系统】->【数据连接】->【数据连接管理】，在右侧页面中点击【驱动管理】按钮打开配置页面，点击【新建驱动】按钮并在弹出窗口中输入名称（比如 `tdengine-websocket`），进行 JDBC 驱动配置。
+
+
+
+**第 5 步**，在驱动配置页面中点击【上传文件】按钮，选择已下载的 `TDengine Java Connector`（比如 `taos-jdbcdriver-3.4.0-dist.jar`）进行上传，上传完成后在【驱动】的下拉列表中选择 `com.taosdata.jdbc.ws.WebSocketDriver`，并点击【保存】。
+
+
+
+**第 6 步**，在 “数据连接管理” 页面中，点击【新建数据连接】按钮，随后点击 “其他” ，在右侧页面中点击 “其他JDBC” 进行连接配置。
+
+
+
+**第 7 步**，在配置页面，先输入数据连接名称，接着在【驱动】选项中选择 “自定义”，并从下拉列表里选取已配置的驱动（例如 `com.taosdata.jdbc.ws.WebSocketDriver (tdengine-websocket)`），之后配置 “数据连接 URL”（例如 `jdbc:TAOS-WS://localhost:6041/power?user=root&password=taosdata&fineBIDialect=mysql`）。设置完成后，点击右上角的【测试连接】进行连接测试，验证成功后点击【保存】即可完成配置。
+
+:::tip
+`fineBIDialect=mysql` 设置的含义是采用 MySQL 数据库的 SQL 方言规则。简单来说，就是告诉 FineBI 按照 MySQL 数据库处理 SQL 语句的特定方式来解析和执行相关的查询与操作。
+:::
+
+
+
+## 数据分析
+
+### 数据准备
+
+**第 1 步**，点击【公共数据】在右侧页面中点击【新建文件夹】即可创建一个文件夹（比如 `TDengine`）， 接着在文件夹的右侧点击【+】按钮，可创建 “数据库表” 数据集或 “SQL数据集”。
+
+
+
+**第 2 步**，点击 “数据库表”，打开数据库选表页面，在左侧 “数据连接” 中选择已创建的连接，则在右侧会显示当前连接的数据库中的所有表，选择需要加载的表（比如 `meters`），点击【确定】即可显示 `meters` 表中的数据。
+
+
+
+
+
+**第 3 步**，点击 “SQL数据集”，打开 SQL 数据集的配置页面，首先输入表名（用于在 FineBI 页面显示），接着在 “数据来自数据连接” 下拉列表中选择已创建的连接， 之后输入 SQL 语句并点击预览即可看到查询结果，最后点击【确定】SQL 数据集即可创建成功。
+
+
+
+### 智能电表样例
+
+**第 1 步**，点击【我的分析】在右侧页面中点击【新建文件夹】即可创建一个文件夹（比如 `TDengine），` 接着在文件夹的右侧点击【+】按钮，可创建 “分析主题”。
+
+
+
+**第 2 步**，在分析主题页面选择数据集（比如 `meters`）后点击【确定】按钮，即可完成数据集关联。
+
+
+
+**第 3 步**，点击分析主题页面下方的【组件】标签，打开图表配置页面, 拖动字段到横轴或纵轴即可展示出图表。
+
+
diff --git a/docs/zh/10-third-party/05-bi/excel/odbc-config.jpg b/docs/zh/10-third-party/05-bi/excel/odbc-config.jpg
deleted file mode 100644
index 58d3395e1b..0000000000
Binary files a/docs/zh/10-third-party/05-bi/excel/odbc-config.jpg and /dev/null differ
diff --git a/docs/zh/10-third-party/05-bi/excel/odbc-config.webp b/docs/zh/10-third-party/05-bi/excel/odbc-config.webp
new file mode 100644
index 0000000000..5b22e7279a
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/excel/odbc-config.webp differ
diff --git a/docs/zh/10-third-party/05-bi/excel/odbc-data.jpg b/docs/zh/10-third-party/05-bi/excel/odbc-data.jpg
deleted file mode 100644
index abe54bba2f..0000000000
Binary files a/docs/zh/10-third-party/05-bi/excel/odbc-data.jpg and /dev/null differ
diff --git a/docs/zh/10-third-party/05-bi/excel/odbc-data.webp b/docs/zh/10-third-party/05-bi/excel/odbc-data.webp
new file mode 100644
index 0000000000..4ce26abc82
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/excel/odbc-data.webp differ
diff --git a/docs/zh/10-third-party/05-bi/excel/odbc-load.jpg b/docs/zh/10-third-party/05-bi/excel/odbc-load.jpg
deleted file mode 100644
index 87d5958d35..0000000000
Binary files a/docs/zh/10-third-party/05-bi/excel/odbc-load.jpg and /dev/null differ
diff --git a/docs/zh/10-third-party/05-bi/excel/odbc-load.webp b/docs/zh/10-third-party/05-bi/excel/odbc-load.webp
new file mode 100644
index 0000000000..822cb9ea74
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/excel/odbc-load.webp differ
diff --git a/docs/zh/10-third-party/05-bi/excel/odbc-menu.jpg b/docs/zh/10-third-party/05-bi/excel/odbc-menu.jpg
deleted file mode 100644
index eed00a8a75..0000000000
Binary files a/docs/zh/10-third-party/05-bi/excel/odbc-menu.jpg and /dev/null differ
diff --git a/docs/zh/10-third-party/05-bi/excel/odbc-menu.webp b/docs/zh/10-third-party/05-bi/excel/odbc-menu.webp
new file mode 100644
index 0000000000..3d894ed58e
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/excel/odbc-menu.webp differ
diff --git a/docs/zh/10-third-party/05-bi/excel/odbc-select.jpg b/docs/zh/10-third-party/05-bi/excel/odbc-select.jpg
deleted file mode 100644
index a6b66f4ea8..0000000000
Binary files a/docs/zh/10-third-party/05-bi/excel/odbc-select.jpg and /dev/null differ
diff --git a/docs/zh/10-third-party/05-bi/excel/odbc-select.webp b/docs/zh/10-third-party/05-bi/excel/odbc-select.webp
new file mode 100644
index 0000000000..0cd3a1e90b
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/excel/odbc-select.webp differ
diff --git a/docs/zh/10-third-party/05-bi/finebi/analysis-chart.webp b/docs/zh/10-third-party/05-bi/finebi/analysis-chart.webp
new file mode 100644
index 0000000000..1ff91e5e34
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/finebi/analysis-chart.webp differ
diff --git a/docs/zh/10-third-party/05-bi/finebi/analysis-object.webp b/docs/zh/10-third-party/05-bi/finebi/analysis-object.webp
new file mode 100644
index 0000000000..4248631ecd
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/finebi/analysis-object.webp differ
diff --git a/docs/zh/10-third-party/05-bi/finebi/common.webp b/docs/zh/10-third-party/05-bi/finebi/common.webp
new file mode 100644
index 0000000000..29ab3b2de6
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/finebi/common.webp differ
diff --git a/docs/zh/10-third-party/05-bi/finebi/connect-manage.webp b/docs/zh/10-third-party/05-bi/finebi/connect-manage.webp
new file mode 100644
index 0000000000..556138f019
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/finebi/connect-manage.webp differ
diff --git a/docs/zh/10-third-party/05-bi/finebi/jdbc-config.webp b/docs/zh/10-third-party/05-bi/finebi/jdbc-config.webp
new file mode 100644
index 0000000000..fc68a281d0
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/finebi/jdbc-config.webp differ
diff --git a/docs/zh/10-third-party/05-bi/finebi/jdbc-connect.webp b/docs/zh/10-third-party/05-bi/finebi/jdbc-connect.webp
new file mode 100644
index 0000000000..e68eda5013
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/finebi/jdbc-connect.webp differ
diff --git a/docs/zh/10-third-party/05-bi/finebi/load-data.webp b/docs/zh/10-third-party/05-bi/finebi/load-data.webp
new file mode 100644
index 0000000000..6801703b91
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/finebi/load-data.webp differ
diff --git a/docs/zh/10-third-party/05-bi/finebi/new-driver.webp b/docs/zh/10-third-party/05-bi/finebi/new-driver.webp
new file mode 100644
index 0000000000..f83d5a5164
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/finebi/new-driver.webp differ
diff --git a/docs/zh/10-third-party/05-bi/finebi/plugin.webp b/docs/zh/10-third-party/05-bi/finebi/plugin.webp
new file mode 100644
index 0000000000..80c947a544
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/finebi/plugin.webp differ
diff --git a/docs/zh/10-third-party/05-bi/finebi/select-table.webp b/docs/zh/10-third-party/05-bi/finebi/select-table.webp
new file mode 100644
index 0000000000..d95380472e
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/finebi/select-table.webp differ
diff --git a/docs/zh/10-third-party/05-bi/finebi/sql-data-config.webp b/docs/zh/10-third-party/05-bi/finebi/sql-data-config.webp
new file mode 100644
index 0000000000..90ac4729a6
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/finebi/sql-data-config.webp differ
diff --git a/docs/zh/10-third-party/05-bi/finebi/table-data.webp b/docs/zh/10-third-party/05-bi/finebi/table-data.webp
new file mode 100644
index 0000000000..14bee7b6bc
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/finebi/table-data.webp differ
diff --git a/docs/zh/10-third-party/05-bi/tableau/tableau-analysis.jpg b/docs/zh/10-third-party/05-bi/tableau/tableau-analysis.jpg
deleted file mode 100644
index 7408804a54..0000000000
Binary files a/docs/zh/10-third-party/05-bi/tableau/tableau-analysis.jpg and /dev/null differ
diff --git a/docs/zh/10-third-party/05-bi/tableau/tableau-analysis.webp b/docs/zh/10-third-party/05-bi/tableau/tableau-analysis.webp
new file mode 100644
index 0000000000..a1880e702d
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/tableau/tableau-analysis.webp differ
diff --git a/docs/zh/10-third-party/05-bi/tableau/tableau-data.jpg b/docs/zh/10-third-party/05-bi/tableau/tableau-data.jpg
deleted file mode 100644
index fe6b8a38e4..0000000000
Binary files a/docs/zh/10-third-party/05-bi/tableau/tableau-data.jpg and /dev/null differ
diff --git a/docs/zh/10-third-party/05-bi/tableau/tableau-data.webp b/docs/zh/10-third-party/05-bi/tableau/tableau-data.webp
new file mode 100644
index 0000000000..7a3d817354
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/tableau/tableau-data.webp differ
diff --git a/docs/zh/10-third-party/05-bi/tableau/tableau-odbc.jpg b/docs/zh/10-third-party/05-bi/tableau/tableau-odbc.jpg
deleted file mode 100644
index e02ba8ee53..0000000000
Binary files a/docs/zh/10-third-party/05-bi/tableau/tableau-odbc.jpg and /dev/null differ
diff --git a/docs/zh/10-third-party/05-bi/tableau/tableau-odbc.webp b/docs/zh/10-third-party/05-bi/tableau/tableau-odbc.webp
new file mode 100644
index 0000000000..a7ff63f30d
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/tableau/tableau-odbc.webp differ
diff --git a/docs/zh/10-third-party/05-bi/tableau/tableau-table.jpg b/docs/zh/10-third-party/05-bi/tableau/tableau-table.jpg
deleted file mode 100644
index 75dd059bf9..0000000000
Binary files a/docs/zh/10-third-party/05-bi/tableau/tableau-table.jpg and /dev/null differ
diff --git a/docs/zh/10-third-party/05-bi/tableau/tableau-table.webp b/docs/zh/10-third-party/05-bi/tableau/tableau-table.webp
new file mode 100644
index 0000000000..6c775329dc
Binary files /dev/null and b/docs/zh/10-third-party/05-bi/tableau/tableau-table.webp differ
diff --git a/docs/zh/14-reference/01-components/01-taosd.md b/docs/zh/14-reference/01-components/01-taosd.md
index 2216cab915..1e6667b31f 100644
--- a/docs/zh/14-reference/01-components/01-taosd.md
+++ b/docs/zh/14-reference/01-components/01-taosd.md
@@ -147,7 +147,7 @@ taosd 命令行参数如下
- 类型：整数
- 单位：毫秒
- 默认值：10000
-- 最小值：0
+- 最小值：3000
- 最大值：86400000
- 动态修改：支持通过 SQL 修改，重启后生效
- 支持版本：v3.3.4.0 引入
diff --git a/docs/zh/14-reference/01-components/02-taosc.md b/docs/zh/14-reference/01-components/02-taosc.md
index 262027bff6..8952e35664 100755
--- a/docs/zh/14-reference/01-components/02-taosc.md
+++ b/docs/zh/14-reference/01-components/02-taosc.md
@@ -221,6 +221,12 @@ TDengine 客户端驱动提供了应用编程所需要的全部 API，并且在
- 动态修改：不支持
- 支持版本：从 v3.0.0.0 版本开始引入
+#### compareAsStrInGreatest
+- 说明：用于决定 greatest、least 函数的参数既有数值类型又有字符串类型时，比较类型的转换规则。
+- 类型：整数；1：统一转为字符串比较，0：统一转为数值类型比较。
+- 动态修改：支持通过 SQL 修改，立即生效
+- 支持版本：从 v3.3.6.0 版本开始引入
+
### 写入相关
#### smlChildTableName
diff --git a/docs/zh/14-reference/02-tools/10-taosbenchmark.md b/docs/zh/14-reference/02-tools/10-taosbenchmark.md
index 1f97b0702a..f22596246f 100644
--- a/docs/zh/14-reference/02-tools/10-taosbenchmark.md
+++ b/docs/zh/14-reference/02-tools/10-taosbenchmark.md
@@ -280,27 +280,45 @@ taosBenchmark -f
### 查询配置参数
查询场景下 `filetype` 必须设置为 `query`。
+
+`query_mode` 查询连接方式，取值为：
+ - “taosc”: 通过 Native 连接方式查询。
+ - “rest” : 通过 restful 连接方式查询。
+
`query_times` 指定运行查询的次数，数值类型。
-查询场景可以通过设置 `kill_slow_query_threshold` 和 `kill_slow_query_interval` 参数来控制杀掉慢查询语句的执行，threshold 控制如果 exec_usec 超过指定时间的查询将被 taosBenchmark 杀掉，单位为秒。
-interval 控制休眠时间，避免持续查询慢查询消耗 CPU，单位为秒。
-其它通用参数详见 [通用配置参数](#通用配置参数)
+其它通用参数详见 [通用配置参数](#通用配置参数)。
#### 执行指定查询语句
查询指定表（可以指定超级表、子表或普通表）的配置参数在 `specified_table_query` 中设置。
-- **mixed_query**：查询模式
- “yes”：`混合查询`
- "no"(默认值)：`普通查询`
- `普通查询`：`sqls` 中每个 sql 启动 `threads` 个线程查询此 sql，执行完 `query_times` 次查询后退出，执行此 sql 的所有线程都完成后进入下一个 sql
+
+- **mixed_query**：混合查询开关。
+ “yes”: 开启 “混合查询”。
+ “no” : 关闭 “混合查询” ，即 “普通查询”。
+
+ - 普通查询：
+
+ `sqls` 中每个 sql 启动 `threads` 个线程查询此 sql, 执行完 `query_times` 次查询后退出，执行此 sql 的所有线程都完成后进入下一个 sql
`查询总次数` = `sqls` 个数 * `query_times` * `threads`
- `混合查询`：`sqls` 中所有 sql 分成 `threads` 个组，每个线程执行一组，每个 sql 都需执行 `query_times` 次查询
+ - 混合查询：
+
+ `sqls` 中所有 sql 分成 `threads` 个组，每个线程执行一组， 每个 sql 都需执行 `query_times` 次查询
`查询总次数` = `sqls` 个数 * `query_times`
+- **batch_query**：批查询功开关。
+ 取值范围 “yes” 表示开启，"no" 不开启，其它值报错。
+ 批查询是指 `sqls` 中所有 sql 分成 `threads` 个组，每个线程执行一组，每个 sql 只执行一次查询后退出，主线程等待所有线程都执行完，再判断是否设置有 `query_interval` 参数，如果有需要 sleep 指定时间，再启动各线程组重复前面的过程，直到查询次数耗尽为止。
+ 功能限制条件：
+ - 只支持 `mixed_query` 为 "yes" 的场景。
+ - 不支持 restful 查询，即 `query_mode` 不能为 "rest"。
+
- **query_interval**：查询时间间隔，单位：millisecond，默认值为 0。
+ "batch_query" 开关打开时，表示是每批查询完间隔时间；关闭时，表示每个 sql 查询完间隔时间
+ 如果执行查询的时间超过间隔时间，那么将不再等待，如果执行查询的时间不足间隔时间，需等待补足间隔时间
- **threads**：执行查询 SQL 的线程数，默认值为 1。
diff --git a/docs/zh/14-reference/03-taos-sql/10-function.md b/docs/zh/14-reference/03-taos-sql/10-function.md
index 9c8e2ebb20..a8959d1d22 100644
--- a/docs/zh/14-reference/03-taos-sql/10-function.md
+++ b/docs/zh/14-reference/03-taos-sql/10-function.md
@@ -65,7 +65,6 @@ ASIN(expr)
**使用说明**：只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
-
#### ATAN
```sql
@@ -84,7 +83,6 @@ ATAN(expr)
**使用说明**：只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
-
#### CEIL
```sql
@@ -121,6 +119,66 @@ COS(expr)
**使用说明**：只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
+#### DEGREES
+
+```sql
+DEGREES(expr)
+```
+
+**功能说明**：计算指定参数由弧度值转为角度后的值。
+
+**版本**：v3.3.3.0
+
+**返回结果类型**：DOUBLE。
+
+**适用数据类型**：数值类型。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
+**使用说明**：
+- 如果 `expr` 为 NULL，则返回 NULL。
+- degree = radian * 180 / π。
+- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
+
+**举例**：
+```sql
+taos> select degrees(PI());
+ degrees(pi()) |
+============================
+ 180.000000000000000 |
+```
+
+#### EXP
+
+```sql
+EXP(expr)
+```
+**功能说明**：返回 e（自然对数的底）的指定乘方后的值。
+
+**版本**：v3.3.3.0
+
+**返回结果类型**：DOUBLE。
+
+**适用数据类型**：数值类型。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
+**使用说明**：
+- 如果 `expr` 为 NULL，返回 NULL。
+- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
+
+**举例**：
+```sql
+taos> select exp(2);
+ exp(2) |
+============================
+ 7.389056098930650 |
+```
+
#### FLOOR
```sql
@@ -128,7 +186,69 @@ FLOOR(expr)
```
**功能说明**：获得指定字段的向下取整数的结果。
- 其他使用说明参见 CEIL 函数描述。
+ 其他使用说明参见 [CEIL](#ceil) 函数描述。
+
+#### GREATEST
+```sql
+GREATEST(expr1, expr2[, expr]...)
+```
+
+**功能说明**：获得输入的所有参数中的最大值。该函数最小参数个数为 2 个。
+
+**使用说明**：ver-3.3.6.0
+
+**返回结果类型**：参考比较规则，比较类型即为最终返回类型。
+
+**适用数据类型**：
+- 数值类型：包括 bool 型，整型和浮点型
+- 字符串类型：包括 nchar 和 varchar 类型。
+
+**比较规则**：以下规则描述了比较操作的转换方式：
+- 如果有任何一个参数为 NULL，则比较结果为 NULL。
+- 如果比较操作中的所有参数都是字符串类型，按照字符串类型比较
+- 如果所有参数都是数值类型，则将它们作为数值类型进行比较。
+- 如果参数中既有字符串类型，也有数值类型，根据 compareAsStrInGreatest 配置项，统一作为字符串或者数值进行比较。默认按照字符串比较。
+- 在所有情况下，不同类型比较，比较类型会选择范围更大的类型进行比较，例如作为整数类型比较时，如果存在 BIGINT 类型，必定会选择 BIGINT 作为比较类型。
+
+**相关配置项**：客户端配置，compareAsStrInGreatest 为 1 表示同时存在字符串类型和数值类型统一转为字符串比较，为 0 表示统一转为数值类型比较。默认为 1。
+
+#### LEAST
+```sql
+LEAST(expr1, expr2[, expr]...)
+```
+
+**功能说明**：获得输入的所有参数中的最小值。其余部分说明同 [GREATEST](#greatest) 函数。
+
+#### LN
+
+```sql
+LN(expr)
+```
+
+**功能说明**：返回指定参数的自然对数。
+
+**版本**：v3.3.3.0
+
+**返回结果类型**：DOUBLE。
+
+**适用数据类型**：数值类型。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
+**使用说明**：
+- 如果 `expr` 为 NULL，返回 NULL。
+- 如果 `epxr` 小于等于 0，返回 NULL。
+- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
+
+**举例**：
+```sql
+taos> select ln(10);
+ ln(10) |
+============================
+ 2.302585092994046 |
+```
#### LOG
@@ -148,6 +268,71 @@ LOG(expr1[, expr2])
**使用说明**：只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
+#### MOD
+
+```sql
+MOD(expr1, expr2)
+```
+
+**功能说明**：计算 expr1 % expr2 的结果。
+
+**版本**：v3.3.3.0
+
+**返回结果类型**：DOUBLE。
+
+**适用数据类型**：数值类型。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
+**使用说明**：
+- 如果 `expr2` 为 0 则返回 NULL。
+- 如果 `expr1` 或 `expr2` 为 NULL，返回 NULL。
+- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
+
+**举例**：
+``` sql
+taos> select mod(10,3);
+ mod(10,3) |
+============================
+ 1.000000000000000 |
+
+taos> select mod(1,0);
+ mod(1,0) |
+============================
+ NULL |
+```
+
+#### PI
+
+```sql
+PI()
+```
+
+**功能说明**：返回圆周率 π 的值。
+
+**版本**：v3.3.3.0
+
+**返回结果类型**：DOUBLE。
+
+**适用数据类型**：无。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
+**使用说明**：
+- π ≈ 3.141592653589793。
+- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
+
+**举例**：
+```sql
+taos> select pi();
+ pi() |
+============================
+ 3.141592653589793 |
+```
#### POW
@@ -167,8 +352,85 @@ POW(expr1, expr2)
**使用说明**：只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
+#### RADIANS
+
+```sql
+RADIANS(expr)
+```
+
+**功能说明**：计算指定参数由角度值转为弧度后的值。
+
+**版本**：v3.3.3.0
+
+**返回结果类型**：DOUBLE。
+
+**适用数据类型**：数值类型。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
+**使用说明**：
+- 如果 `expr` 为 NULL，则返回 NULL。
+- radian = degree * π / 180。
+- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
+
+**举例**：
+```sql
+taos> select radians(180);
+ radians(180) |
+============================
+ 3.141592653589793 |
+```
+
+#### RAND
+
+```sql
+RAND([seed])
+```
+
+**功能说明**：返回一个从0到1均匀分布的随机数。
+
+**版本**：v3.3.3.0
+
+**返回结果类型**：DOUBLE。
+
+**适用数据类型**：
+- `seed`：INTEGER。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
+**使用说明**：
+- 如果指定了 `seed` 值，那么将会用指定的 `seed` 作为随机种子，确保生成的随机数序列具有确定性。
+- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
+
+**举例**：
+``` sql
+taos> select rand();
+ rand() |
+============================
+ 0.202092426923147 |
+
+taos> select rand();
+ rand() |
+============================
+ 0.131537788143166 |
+
+taos> select rand(1);
+ rand(1) |
+============================
+ 0.000007826369259 |
+
+taos> select rand(1);
+ rand(1) |
+============================
+ 0.000007826369259 |
+```
#### ROUND
+
```sql
ROUND(expr[, digits])
```
@@ -208,6 +470,49 @@ taos> select round(8888.88,-1);
8890.000000000000000 |
```
+#### SIGN
+
+```sql
+SIGN(expr)
+```
+
+**功能说明**：返回指定参数的符号。
+
+**版本**：v3.3.3.0
+
+**返回结果类型**：与指定字段的原始数据类型一致。
+
+**适用数据类型**：数值类型。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
+**使用说明**：
+- 如果 `expr` 为负，返回 -1。
+- 如果 `expr` 为正，返回 1。
+- 如果 `expr` 为 0，返回 0。
+- 如果 `expr` 为 NULL，返回 NULL。
+- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
+
+**举例**：
+```sql
+taos> select sign(-1);
+ sign(-1) |
+========================
+ -1 |
+
+taos> select sign(1);
+ sign(1) |
+========================
+ 1 |
+
+taos> select sign(0);
+ sign(0) |
+========================
+ 0 |
+```
+
#### SIN
```sql
@@ -262,36 +567,8 @@ TAN(expr)
**使用说明**：只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
-#### PI
-```sql
-PI()
-```
-
-**功能说明**：返回圆周率 π 的值。
-
-**版本**：v3.3.3.0
-
-**返回结果类型**：DOUBLE。
-
-**适用数据类型**：无。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-**使用说明**：
-- π ≈ 3.141592653589793。
-- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
-
-**举例**：
-```sql
-taos> select pi();
- pi() |
-============================
- 3.141592653589793 |
-```
-
##### TRUNCATE
+
```sql
TRUNCATE(expr, digits)
```
@@ -332,249 +609,88 @@ taos> select truncate(8888.88, -1);
8880.000000000000000 |
```
-#### EXP
-```sql
-EXP(expr)
-```
-**功能说明**：返回 e（自然对数的底）的指定乘方后的值。
-
-**版本**：v3.3.3.0
-
-**返回结果类型**：DOUBLE。
-
-**适用数据类型**：数值类型。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-**使用说明**：
-- 如果 `expr` 为 NULL，返回 NULL。
-- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
-
-**举例**：
-```sql
-taos> select exp(2);
- exp(2) |
-============================
- 7.389056098930650 |
-```
-
-#### LN
-```sql
-LN(expr)
-```
-
-**功能说明**：返回指定参数的自然对数。
-
-**版本**：v3.3.3.0
-
-**返回结果类型**：DOUBLE。
-
-**适用数据类型**：数值类型。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-**使用说明**：
-- 如果 `expr` 为 NULL，返回 NULL。
-- 如果 `epxr` 小于等于 0，返回 NULL。
-- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
-
-**举例**：
-```sql
-taos> select ln(10);
- ln(10) |
-============================
- 2.302585092994046 |
-```
-
-#### MOD
-```sql
-MOD(expr1, expr2)
-```
-
-**功能说明**：计算 expr1 % expr2 的结果。
-
-**版本**：v3.3.3.0
-
-**返回结果类型**：DOUBLE。
-
-**适用数据类型**：数值类型。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-**使用说明**：
-- 如果 `expr2` 为 0 则返回 NULL。
-- 如果 `expr1` 或 `expr2` 为 NULL，返回 NULL。
-- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
-
-**举例**：
-``` sql
-taos> select mod(10,3);
- mod(10,3) |
-============================
- 1.000000000000000 |
-
-taos> select mod(1,0);
- mod(1,0) |
-============================
- NULL |
-```
-
-#### RAND
-```sql
-RAND([seed])
-```
-
-**功能说明**：返回一个从0到1均匀分布的随机数。
-
-**版本**：v3.3.3.0
-
-**返回结果类型**：DOUBLE。
-
-**适用数据类型**：
-- `seed`：INTEGER。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-**使用说明**：
-- 如果指定了 `seed` 值，那么将会用指定的 `seed` 作为随机种子，确保生成的随机数序列具有确定性。
-- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
-
-**举例**：
-``` sql
-taos> select rand();
- rand() |
-============================
- 0.202092426923147 |
-
-taos> select rand();
- rand() |
-============================
- 0.131537788143166 |
-
-taos> select rand(1);
- rand(1) |
-============================
- 0.000007826369259 |
-
-taos> select rand(1);
- rand(1) |
-============================
- 0.000007826369259 |
-```
-
-#### SIGN
-```sql
-SIGN(expr)
-```
-
-**功能说明**：返回指定参数的符号。
-
-**版本**：v3.3.3.0
-
-**返回结果类型**：与指定字段的原始数据类型一致。
-
-**适用数据类型**：数值类型。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-**使用说明**：
-- 如果 `expr` 为负，返回 -1。
-- 如果 `expr` 为正，返回 1。
-- 如果 `expr` 为 0，返回 0。
-- 如果 `expr` 为 NULL，返回 NULL。
-- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
-
-**举例**：
-```sql
-taos> select sign(-1);
- sign(-1) |
-========================
- -1 |
-
-taos> select sign(1);
- sign(1) |
-========================
- 1 |
-
-taos> select sign(0);
- sign(0) |
-========================
- 0 |
-```
-
-#### DEGREES
-```sql
-DEGREES(expr)
-```
-
-**功能说明**：计算指定参数由弧度值转为角度后的值。
-
-**版本**：v3.3.3.0
-
-**返回结果类型**：DOUBLE。
-
-**适用数据类型**：数值类型。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-**使用说明**：
-- 如果 `expr` 为 NULL，则返回 NULL。
-- degree = radian * 180 / π。
-- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
-
-**举例**：
-```sql
-taos> select degrees(PI());
- degrees(pi()) |
-============================
- 180.000000000000000 |
-```
-
-#### RADIANS
-```sql
-RADIANS(expr)
-```
-
-**功能说明**：计算指定参数由角度值转为弧度后的值。
-
-**版本**：v3.3.3.0
-
-**返回结果类型**：DOUBLE。
-
-**适用数据类型**：数值类型。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-**使用说明**：
-- 如果 `expr` 为 NULL，则返回 NULL。
-- radian = degree * π / 180。
-- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用。
-
-**举例**：
-```sql
-taos> select radians(180);
- radians(180) |
-============================
- 3.141592653589793 |
-```
### 字符串函数
字符串函数的输入参数为字符串类型，返回结果为数值类型或字符串类型。
+#### ASCII
+
+```sql
+ASCII(expr)
+```
+
+**功能说明**：返回字符串第一个字符的 ASCII 码。
+
+**版本**：v3.3.3.0
+
+**返回结果数据类型**：BIGINT。
+
+**适用数据类型**：VARCHAR、NCHAR。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
+**使用说明**：
+- 如果 `expr` 为 NULL，返回 NULL。
+- 如果 `expr` 的第一个字符为多字节字符，只会返回该字符第一个字节的值对应的 ASCII 码。
+
+**举例**：
+```sql
+taos> select ascii('testascii');
+ ascii('testascii') |
+=====================
+ 116 |
+```
+
+#### CHAR
+
+```sql
+CHAR(expr1 [, expr2] [, epxr3] ...)
+```
+
+**功能说明**：将输入参数当作整数，并返回这些整数在 ASCII 编码中对应的字符。
+
+**版本**：v3.3.3.0
+
+**返回结果类型**：VARCHAR。
+
+**适用数据类型**：整数类型,VARCHAR、NCHAR。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
+**使用说明**：
+- 输入的值超过 255 会被转化成多字节的结果，如 `CHAR(256)` 等同于 `CHAR(1,0)`、`CHAR(256 * 256)` 等同于 `CHAR(1,0,0)`。
+- 输入参数的 NULL 值会被跳过。
+- 输入参数若为字符串类型，会将其转换为数值类型处理。
+- 若输入的参数对应的字符为不可打印字符，返回值中仍有该参数对应的字符，但是可能无法显示出来。
+- 输入参数的个数上限为 2^31 - 1 个。
+
+**举例**：
+```sql
+taos> select char(77);
+ char(77) |
+===========
+ M |
+
+taos> select char(77,77);
+ char(77,77) |
+==============
+ MM |
+
+taos> select char(77 * 256 + 77);
+ char(77 * 256 + 77) |
+======================
+ MM |
+
+taos> select char(77,NULL,77);
+ char(77,null,77) |
+===================
+ MM |
+```
+
#### CHAR_LENGTH
```sql
@@ -628,7 +744,6 @@ CONCAT(expr1, expr2 [, expr] ... )
**适用于**：表和超级表。
-
#### CONCAT_WS
```sql
@@ -645,7 +760,6 @@ CONCAT_WS(separator_expr, expr1, expr2 [, expr] ...)
**适用于**：表和超级表。
-
#### LENGTH
```sql
@@ -662,7 +776,6 @@ LENGTH(expr)
**适用于**：表和超级表。
-
#### LOWER
```sql
@@ -696,6 +809,120 @@ LTRIM(expr)
**适用于**：表和超级表。
+#### POSITION
+
+```sql
+POSITION(expr1 IN expr2)
+```
+
+**功能说明**：计算字符串 `expr1` 在字符串 `expr2` 中的位置。
+
+**版本**：v3.3.3.0
+
+**返回结果类型**：BIGINT。
+
+**适用数据类型**：
+- `expr1`：VARCHAR、NCHAR。
+- `expr2`：VARCHAR、NCHAR。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
+**使用说明**：
+- 若 `expr1` 或 `expr2` 为 NULL，返回 NULL。
+- 若 `expr1` 在 `expr2` 中不存在，返回 0。
+- 若 `expr1` 为空串，认为 `expr1` 在 `expr2` 中总能匹配成功，返回 1。
+- 返回的位置是 1-base 的。
+- 该函数是多字节安全的。
+
+**举例**：
+```sql
+taos> select position('a' in 'cba');
+ position('a' in 'cba') |
+=========================
+ 3 |
+
+
+taos> select position('' in 'cba');
+ position('' in 'cba') |
+========================
+ 1 |
+
+taos> select position('d' in 'cba');
+ position('d' in 'cba') |
+=========================
+ 0 |
+```
+
+#### REPEAT
+
+```sql
+REPEAT(expr, count)
+```
+**功能说明**：返回将字符串重复指定次数得到的字符串。
+
+**版本**：v3.3.3.0
+
+**返回结果类型**：与输入字段 `expr` 的原始类型相同。
+
+**适用数据类型**：
+- `expr`：VARCHAR、NCHAR。
+- `count`：INTEGER。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
+**使用说明**：
+- 若 `count < 1`，返回空串。
+- 若 `expr` 或 `count` 为 NULL，返回 NULL。
+
+**举例**：
+```sql
+taos> select repeat('abc',5);
+ repeat('abc',5) |
+============================
+ abcabcabcabcabc |
+
+taos> select repeat('abc',-1);
+ repeat('abc',-1) |
+===================
+ |
+```
+
+#### REPLACE
+
+```sql
+REPLACE(expr, from_str, to_str)
+```
+**功能说明**：将字符串中的 `from_str` 全部替换为 `to_str`。
+
+**版本**：v3.3.3.0
+
+**返回结果类型**：与输入字段 `expr` 的原始类型相同。
+
+**适用数据类型**：
+- `expr`：VARCHAR、NCHAR。
+- `from_str`：VARCHAR、NCHAR。
+- `to_str`：VARCHAR、NCHAR。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
+**使用说明**：
+- 该函数是大小写敏感的。
+- 任意参数为 NULL，返回 NULL。
+- 该函数是多字节安全的。
+
+**举例**：
+```sql
+taos> select replace('aabbccAABBCC', 'AA', 'DD');
+ replace('aabbccAABBCC', 'AA', 'DD') |
+======================================
+ aabbccDDBBCC |
+```
#### RTRIM
@@ -713,62 +940,8 @@ RTRIM(expr)
**适用于**：表和超级表。
-#### TRIM
-```sql
-TRIM([{LEADING | TRAILING | BOTH} [remstr] FROM] expr)
-TRIM([remstr FROM] expr)
-```
-
-**功能说明**：返回去掉了所有 remstr 前缀或后缀的字符串 epxr。
-
-**版本**：v3.3.3.0
-
-**返回结果类型**：与输入字段 epxr 的原始类型相同。
-
-**适用数据类型**：
-- remstr：VARCHAR、NCHAR。
-- epxr：VARCHAR、NCHAR。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-**使用说明**：
-- 第一个可选变量 [LEADING | BOTH | TRAILING] 指定要剪裁字符串的哪一侧：
- - LEADING 将移除字符串开头的指定字符。
- - TRAILING 将移除字符串末尾的指定字符。
- - BOTH（默认值）将移除字符串开头和末尾的指定字符。
-- 第二个可选变量[remstr]指定要裁剪掉的字符串：
- - 如果不指定 remstr，默认裁剪空格。
- - remstr 可以指定多个字符，如 trim('ab' from 'abacd')，此时会将 'ab' 看做一个整体来裁剪，得到裁剪结果 'acd'。
-- 若 expr 为 NULL，返回 NULL。
-- 该函数是多字节安全的。
-
-**举例**：
-```sql
-taos> select trim(' a ');
- trim(' a ') |
-=============================
- a |
-
-taos> select trim(leading from ' a ');
- trim(leading from ' a ') |
-==========================================
- a |
-
-
-taos> select trim(leading 'b' from 'bbbbbbbba ');
- trim(leading 'b' from 'bbbbbbbba ') |
-==============================================
- a |
-
-taos> select trim(both 'b' from 'bbbbbabbbbbb');
- trim(both 'b' from 'bbbbbabbbbbb') |
-=====================================
- a |
-```
-
#### SUBSTRING/SUBSTR
+
```sql
SUBSTRING/SUBSTR(expr, pos [, len])
SUBSTRING/SUBSTR(expr FROM pos [FOR len])
@@ -826,6 +999,7 @@ taos> select substring('tdengine', -3,-3);
```
#### SUBSTRING_INDEX
+
```sql
SUBSTRING_INDEX(expr, delim, count)
```
@@ -864,6 +1038,62 @@ taos> select substring_index('www.taosdata.com','.',-2);
taosdata.com |
```
+#### TRIM
+
+```sql
+TRIM([{LEADING | TRAILING | BOTH} [remstr] FROM] expr)
+TRIM([remstr FROM] expr)
+```
+
+**功能说明**：返回去掉了所有 remstr 前缀或后缀的字符串 epxr。
+
+**版本**：v3.3.3.0
+
+**返回结果类型**：与输入字段 epxr 的原始类型相同。
+
+**适用数据类型**：
+- remstr：VARCHAR、NCHAR。
+- epxr：VARCHAR、NCHAR。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
+**使用说明**：
+- 第一个可选变量[LEADING | BOTH | TRAILING]指定要剪裁字符串的哪一侧：
+ - LEADING 将移除字符串开头的指定字符。
+ - TRAILING 将移除字符串末尾的指定字符。
+ - BOTH（默认值）将移除字符串开头和末尾的指定字符。
+- 第二个可选变量[remstr]指定要裁剪掉的字符串：
+ - 如果不指定 remstr，默认裁剪空格。
+ - remstr 可以指定多个字符，如trim('ab' from 'abacd')，此时会将 'ab' 看做一个整体来裁剪，得到裁剪结果 'acd'。
+- 若 expr 为 NULL，返回 NULL。
+- 该函数是多字节安全的。
+
+**举例**：
+```sql
+taos> select trim(' a ');
+ trim(' a ') |
+=============================
+ a |
+
+taos> select trim(leading from ' a ');
+ trim(leading from ' a ') |
+==========================================
+ a |
+
+
+taos> select trim(leading 'b' from 'bbbbbbbba ');
+ trim(leading 'b' from 'bbbbbbbba ') |
+==============================================
+ a |
+
+taos> select trim(both 'b' from 'bbbbbabbbbbb');
+ trim(both 'b' from 'bbbbbabbbbbb') |
+=====================================
+ a |
+```
+
#### UPPER
```sql
@@ -880,193 +1110,6 @@ UPPER(expr)
**适用于**：表和超级表。
-#### CHAR
-```sql
-CHAR(expr1 [, expr2] [, epxr3] ...)
-```
-
-**功能说明**：将输入参数当作整数，并返回这些整数在 ASCII 编码中对应的字符。
-
-**版本**：v3.3.3.0
-
-**返回结果类型**：VARCHAR。
-
-**适用数据类型**：整数类型,VARCHAR、NCHAR。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-**使用说明**：
-- 输入的值超过 255 会被转化成多字节的结果，如 `CHAR(256)` 等同于 `CHAR(1,0)`、`CHAR(256 * 256)` 等同于 `CHAR(1,0,0)`。
-- 输入参数的 NULL 值会被跳过。
-- 输入参数若为字符串类型，会将其转换为数值类型处理。
-- 若输入的参数对应的字符为不可打印字符，返回值中仍有该参数对应的字符，但是可能无法显示出来。
-- 输入参数的个数上限为 2^31 - 1 个。
-
-**举例**：
-```sql
-taos> select char(77);
- char(77) |
-===========
- M |
-
-taos> select char(77,77);
- char(77,77) |
-==============
- MM |
-
-taos> select char(77 * 256 + 77);
- char(77 * 256 + 77) |
-======================
- MM |
-
-taos> select char(77,NULL,77);
- char(77,null,77) |
-===================
- MM |
-```
-
-#### ASCII
-```sql
-ASCII(expr)
-```
-
-**功能说明**：返回字符串第一个字符的 ASCII 码。
-
-**版本**：v3.3.3.0
-
-**返回结果数据类型**：BIGINT。
-
-**适用数据类型**：VARCHAR、NCHAR。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-**使用说明**：
-- 如果 `expr` 为 NULL，返回 NULL。
-- 如果 `expr` 的第一个字符为多字节字符，只会返回该字符第一个字节的值对应的 ASCII 码。
-
-**举例**：
-```sql
-taos> select ascii('testascii');
- ascii('testascii') |
-=====================
- 116 |
-```
-
-#### POSITION
-```sql
-POSITION(expr1 IN expr2)
-```
-
-**功能说明**：计算字符串 `expr1` 在字符串 `expr2` 中的位置。
-
-**版本**：v3.3.3.0
-
-**返回结果类型**：BIGINT。
-
-**适用数据类型**：
-- `expr1`：VARCHAR、NCHAR。
-- `expr2`：VARCHAR、NCHAR。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-**使用说明**：
-- 若 `expr1` 或 `expr2` 为 NULL，返回 NULL。
-- 若 `expr1` 在 `expr2` 中不存在，返回 0。
-- 若 `expr1` 为空串，认为 `expr1` 在 `expr2` 中总能匹配成功，返回 1。
-- 返回的位置是 1-base 的。
-- 该函数是多字节安全的。
-
-**举例**：
-```sql
-taos> select position('a' in 'cba');
- position('a' in 'cba') |
-=========================
- 3 |
-
-
-taos> select position('' in 'cba');
- position('' in 'cba') |
-========================
- 1 |
-
-taos> select position('d' in 'cba');
- position('d' in 'cba') |
-=========================
- 0 |
-```
-
-#### REPLACE
-```sql
-REPLACE(expr, from_str, to_str)
-```
-**功能说明**：将字符串中的 `from_str` 全部替换为 `to_str`。
-
-**版本**：v3.3.3.0
-
-**返回结果类型**：与输入字段 `expr` 的原始类型相同。
-
-**适用数据类型**：
-- `expr`：VARCHAR、NCHAR。
-- `from_str`：VARCHAR、NCHAR。
-- `to_str`：VARCHAR、NCHAR。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-**使用说明**：
-- 该函数是大小写敏感的。
-- 任意参数为 NULL，返回 NULL。
-- 该函数是多字节安全的。
-
-**举例**：
-```sql
-taos> select replace('aabbccAABBCC', 'AA', 'DD');
- replace('aabbccAABBCC', 'AA', 'DD') |
-======================================
- aabbccDDBBCC |
-```
-
-#### REPEAT
-```sql
-REPEAT(expr, count)
-```
-**功能说明**：返回将字符串重复指定次数得到的字符串。
-
-**版本**：v3.3.3.0
-
-**返回结果类型**：与输入字段 `expr` 的原始类型相同。
-
-**适用数据类型**：
-- `expr`：VARCHAR、NCHAR。
-- `count`：INTEGER。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-**使用说明**：
-- 若 `count < 1`，返回空串。
-- 若 `expr` 或 `count` 为 NULL，返回 NULL。
-
-**举例**：
-```sql
-taos> select repeat('abc',5);
- repeat('abc',5) |
-============================
- abcabcabcabcabc |
-
-taos> select repeat('abc',-1);
- repeat('abc',-1) |
-===================
- |
-```
### 转换函数
转换函数将值从一种数据类型转换为另一种数据类型。
@@ -1095,72 +1138,6 @@ CAST(expr AS type_name)
- 转换到数值类型时，数值大于 type_name 可表示的范围时，则会溢出，但不会报错。
- 转换到字符串类型时，如果转换后长度超过 type_name 中指定的长度，则会截断，但不会报错。
-#### TO_ISO8601
-
-```sql
-TO_ISO8601(expr [, timezone])
-```
-
-**功能说明**：将时间戳转换成为 ISO8601 标准的日期时间格式，并附加时区信息。timezone 参数允许用户为输出结果指定附带任意时区信息。如果 timezone 参数省略，输出结果则附带当前客户端的系统时区信息。
-
-**返回结果数据类型**：VARCHAR 类型。
-
-**适用数据类型**：INTEGER、TIMESTAMP。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-**使用说明**：
-
-- timezone 参数允许输入的时区格式为：[z/Z, +/-hhmm, +/-hh, +/-hh:mm]。例如，TO_ISO8601(1, "+00:00")。
-- 输入时间戳的精度由所查询表的精度确定，若未指定表，则精度为毫秒.
-
-
-#### TO_JSON
-
-```sql
-TO_JSON(str_literal)
-```
-
-**功能说明**：将字符串常量转换为 JSON 类型。
-
-**返回结果数据类型**：JSON。
-
-**适用数据类型**：JSON 字符串，形如 '\{ "literal" : literal }'。'\{}'表示空值。键必须为字符串字面量，值可以为数值字面量、字符串字面量、布尔字面量或空值字面量。str_literal 中不支持转义符。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-
-#### TO_UNIXTIMESTAMP
-
-```sql
-TO_UNIXTIMESTAMP(expr [, return_timestamp])
-
-return_timestamp: {
- 0
- | 1
-}
-```
-
-**功能说明**：将日期时间格式的字符串转换成为时间戳。
-
-**返回结果数据类型**：BIGINT、TIMESTAMP。
-
-**应用字段**：VARCHAR、NCHAR。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-**使用说明**：
-
-- 输入的日期时间字符串须符合 ISO8601/RFC3339 标准，无法转换的字符串格式将返回 NULL。
-- 返回的时间戳精度与当前 DATABASE 设置的时间精度一致。
-- return_timestamp 指定函数返回值是否为时间戳类型，设置为 1 时返回 TIMESTAMP 类型，设置为 0 时返回 BIGINT 类型。如不指定缺省返回 BIGINT 类型。
-
#### TO_CHAR
```sql
@@ -1222,6 +1199,43 @@ TO_CHAR(ts, format_str_literal)
- 推荐在时间格式中带时区信息，如果不带则默认输出的时区为服务端或客户端所配置的时区。
- 输入时间戳的精度由所查询表的精度确定，若未指定表，则精度为毫秒。
+#### TO_ISO8601
+
+```sql
+TO_ISO8601(expr [, timezone])
+```
+
+**功能说明**：将时间戳转换成为 ISO8601 标准的日期时间格式，并附加时区信息。timezone 参数允许用户为输出结果指定附带任意时区信息。如果 timezone 参数省略，输出结果则附带当前客户端的系统时区信息。
+
+**返回结果数据类型**：VARCHAR 类型。
+
+**适用数据类型**：INTEGER、TIMESTAMP。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
+**使用说明**：
+
+- timezone 参数允许输入的时区格式为：[z/Z, +/-hhmm, +/-hh, +/-hh:mm]。例如，TO_ISO8601(1, "+00:00")。
+- 输入时间戳的精度由所查询表的精度确定，若未指定表，则精度为毫秒.
+
+#### TO_JSON
+
+```sql
+TO_JSON(str_literal)
+```
+
+**功能说明**：将字符串常量转换为 JSON 类型。
+
+**返回结果数据类型**：JSON。
+
+**适用数据类型**：JSON 字符串，形如 '\{ "literal" : literal }'。'\{}'表示空值。键必须为字符串字面量，值可以为数值字面量、字符串字面量、布尔字面量或空值字面量。str_literal 中不支持转义符。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
#### TO_TIMESTAMP
```sql
@@ -1252,6 +1266,32 @@ TO_TIMESTAMP(ts_str_literal, format_str_literal)
- `to_timestamp` 转换具有一定的容错机制，在格式串和时间戳串不完全对应时，有时也可转换，如 `to_timestamp('200101/2', 'yyyyMM1/dd')`，格式串中多出来的1会被丢弃。格式串与时间戳串中多余的空格字符(空格、tab 等)也会被自动忽略，如 `to_timestamp(' 23 年 - 1 月 - 01 日 ', 'yy 年-MM月-dd日')` 可以被成功转换。虽然 `MM` 等字段需要两个数字对应(只有一位时前面补 0), 在 `to_timestamp` 时，一个数字也可以成功转换。
- 输出时间戳的精度与查询表的精度相同，若查询未指定表，则输出精度为毫秒，如 `select to_timestamp('2023-08-1 10:10:10.123456789', 'yyyy-mm-dd hh:mi:ss.ns')` 的输出将会把微秒和纳秒进行截断、如果指定一张纳秒表，那么就不会发生截断，如 `select to_timestamp('2023-08-1 10:10:10.123456789', 'yyyy-mm-dd hh:mi:ss.ns') from db_ns.table_ns limit 1`。
+#### TO_UNIXTIMESTAMP
+
+```sql
+TO_UNIXTIMESTAMP(expr [, return_timestamp])
+
+return_timestamp: {
+ 0
+ | 1
+}
+```
+
+**功能说明**：将日期时间格式的字符串转换成为时间戳。
+
+**返回结果数据类型**：BIGINT、TIMESTAMP。
+
+**应用字段**：VARCHAR、NCHAR。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
+**使用说明**：
+
+- 输入的日期时间字符串须符合 ISO8601/RFC3339 标准，无法转换的字符串格式将返回 NULL。
+- 返回的时间戳精度与当前 DATABASE 设置的时间精度一致。
+- return_timestamp 指定函数返回值是否为时间戳类型，设置为 1 时返回 TIMESTAMP 类型，设置为 0 时返回 BIGINT 类型。如不指定缺省返回 BIGINT 类型。
### 时间和日期函数
@@ -1259,6 +1299,35 @@ TO_TIMESTAMP(ts_str_literal, format_str_literal)
所有返回当前时间的函数，如 NOW、TODAY 和 TIMEZONE，在一条 SQL 语句中不论出现多少次都只会被计算一次。
+#### DAYOFWEEK
+```sql
+DAYOFWEEK(expr)
+```
+**功能说明**：返回输入日期是周几。
+
+**版本**：v3.3.3.0
+
+**返回结果类型**：BIGINT。
+
+**适用数据类型**：表示时间戳的 BIGINT、TIMESTAMP 类型，或符合 ISO8601/RFC3339 标准的日期时间格式的 VARCHAR、NCHAR 类型。
+
+**嵌套子查询支持**：适用于内层查询和外层查询。
+
+**适用于**：表和超级表。
+
+**使用说明**：
+- 返回值 1 代表周日，2 代表周一 ... 7 代表周六
+- 若 `expr` 为 NULL，返回 NULL。
+- 输入时间戳的精度由所查询表的精度确定，若未指定表，则精度为毫秒。
+
+**举例**：
+```sql
+taos> select dayofweek('2000-01-01');
+ dayofweek('2000-01-01') |
+==========================
+ 7 |
+```
+
#### NOW
```sql
@@ -1281,7 +1350,6 @@ NOW()
b(纳秒)、u(微秒)、a(毫秒)、s(秒)、m(分)、h(小时)、d(天)、w(周)。
- 返回的时间戳精度与当前 DATABASE 设置的时间精度一致。
-
#### TIMEDIFF
```sql
@@ -1355,7 +1423,6 @@ use_current_timezone: {
- 当将时间值截断到一周（1w）时，timetruncate 的计算是基于 Unix 时间戳（1970年1月1日00:00:00 UTC）进行的。Unix 时间戳始于星期四，
因此所有截断后的日期都是星期四。
-
#### TIMEZONE
```sql
@@ -1370,7 +1437,6 @@ TIMEZONE()
**适用于**：表和超级表。
-
#### TODAY
```sql
@@ -1392,6 +1458,7 @@ TODAY()
- 返回的时间戳精度与当前 DATABASE 设置的时间精度一致。
#### WEEK
+
```sql
WEEK(expr [, mode])
```
@@ -1454,35 +1521,6 @@ taos> select week('2000-01-01',3);
52 |
```
-#### WEEKOFYEAR
-```sql
-WEEKOFYEAR(expr)
-```
-**功能说明**：返回输入日期的周数。
-
-**版本**：v3.3.3.0
-
-**返回结果类型**：BIGINT。
-
-**适用数据类型**：表示时间戳的 BIGINT、TIMESTAMP 类型，或符合 ISO8601/RFC3339 标准的日期时间格式的 VARCHAR、NCHAR 类型。
-
-**嵌套子查询支持**：适用于内层查询和外层查询。
-
-**适用于**：表和超级表。
-
-**使用说明**：
-- 等同于`WEEK(expr, 3)`，即在每周第一天是周一，返回值范围为 1-53，第一个包含四天及以上的周为第 1 周的条件下判断输入日期的周数。
-- 若 `expr` 为 NULL，返回 NULL。
-- 输入时间戳的精度由所查询表的精度确定，未未指定表，则精度为毫秒。
-
-**举例**：
-```sql
-taos> select weekofyear('2000-01-01');
- weekofyear('2000-01-01') |
-===========================
- 52 |
-```
-
#### WEEKDAY
```sql
WEEKDAY(expr)
@@ -1512,11 +1550,12 @@ taos> select weekday('2000-01-01');
5 |
```
-#### DAYOFWEEK
+#### WEEKOFYEAR
+
```sql
-DAYOFWEEK(expr)
+WEEKOFYEAR(expr)
```
-**功能说明**：返回输入日期是周几。
+**功能说明**：返回输入日期的周数。
**版本**：v3.3.3.0
@@ -1529,19 +1568,18 @@ DAYOFWEEK(expr)
**适用于**：表和超级表。
**使用说明**：
-- 返回值 1 代表周日，2 代表周一 ... 7 代表周六。
+- 等同于`WEEK(expr, 3)`，即在每周第一天是周一，返回值范围为 1 - 53，第一个包含四天及以上的周为第 1 周的条件下判断输入日期的周数。
- 若 `expr` 为 NULL，返回 NULL。
-- 输入时间戳的精度由所查询表的精度确定，若未指定表，则精度为毫秒。
-
+- 输入时间戳的精度由所查询表的精度确定，未指定表，则精度为毫秒。
+
**举例**：
```sql
-taos> select dayofweek('2000-01-01');
- dayofweek('2000-01-01') |
-==========================
- 7 |
+taos> select weekofyear('2000-01-01');
+ weekofyear('2000-01-01') |
+===========================
+ 52 |
```
-
## 聚合函数
聚合函数为查询结果集的每一个分组返回单个结果行。可以由 GROUP BY 或窗口切分子句指定分组，如果没有，则整个查询结果集视为一个分组。
@@ -1586,7 +1624,6 @@ AVG(expr)
**适用于**：表和超级表。
-
### COUNT
```sql
@@ -1606,7 +1643,6 @@ COUNT({* | expr})
- 可以使用星号 (\*) 来替代具体的字段，使用星号 (\*) 返回全部记录数量。
- 如果统计字段是具体的列，则返回该列中非 NULL 值的记录数量。
-
### ELAPSED
```sql
@@ -1632,6 +1668,50 @@ ELAPSED(ts_primary_key [, time_unit])
- 对于嵌套查询，仅当内层查询会输出隐式时间戳列时有效。例如 `select elapsed(ts) from (select diff(value) from sub1)` 语句，diff 函数会让内层查询输出隐式时间戳列，此为主键列，可以用于 elapsed 函数的第一个参数。相反，例如 `select elapsed(ts) from (select * from sub1)` 语句，ts 列输出到外层时已经没有了主键列的含义，无法使用 elapsed 函数。此外，elapsed 函数作为一个与时间线强依赖的函数，形如 `select elapsed(ts) from (select diff(value) from st group by tbname)` 尽管会返回一条计算结果，但并无实际意义，这种用法后续也将被限制。
- 不支持与 leastsquares、diff、derivative、top、bottom、last_row、interp 等函数混合使用。
+### HISTOGRAM
+
+```sql
+HISTOGRAM(expr，bin_type, bin_description, normalized)
+```
+
+**功能说明**：统计数据按照用户指定区间的分布。
+
+**返回结果类型**：如归一化参数 normalized 设置为 1，返回结果为 DOUBLE 类型，否则为 BIGINT 类型。
+
+**适用数据类型**：数值型字段。
+
+**适用于**：表和超级表。
+
+**详细说明**：
+- bin_type 用户指定的分桶类型，有效输入类型为 "user_input"、"linear_bin"、"log_bin"。
+- bin_description 描述如何生成分桶区间，针对三种桶类型，分别为以下描述格式(均为 JSON 格式字符串)：
+ - "user_input": "[1, 3, 5, 7]"
+ 用户指定 bin 的具体数值。
+
+ - "linear_bin": "\{"start": 0.0, "width": 5.0, "count": 5, "infinity": true}"
+ "start" 表示数据起始点，"width" 表示每次 bin 偏移量，"count" 为 bin 的总数，"infinity" 表示是否添加（-inf, inf）作为区间起点和终点，
+ 生成区间为[-inf, 0.0, 5.0, 10.0, 15.0, 20.0, +inf]。
+
+ - "log_bin": "\{"start":1.0, "factor": 2.0, "count": 5, "infinity": true}"
+ "start" 表示数据起始点，"factor" 表示按指数递增的因子，"count" 为 bin 的总数，"infinity" 表示是否添加（-inf, inf）作为区间起点和终点，
+ 生成区间为[-inf, 1.0, 2.0, 4.0, 8.0, 16.0, +inf]。
+- normalized 是否将返回结果归一化到 0~1 之间。有效输入为 0 和 1。
+
+### HYPERLOGLOG
+
+```sql
+HYPERLOGLOG(expr)
+```
+
+**功能说明**：
+ - 采用 hyperloglog 算法，返回某列的基数。该算法在数据量很大的情况下，可以明显降低内存的占用，求出来的基数是个估算值，标准误差（标准误差是多次实验，每次的平均数的标准差，不是与真实结果的误差）为 0.81%。
+ - 在数据量较少的时候该算法不是很准确，可以使用 `select count(data) from (select unique(col) as data from table)` 的方法。
+
+**返回结果类型**：INTEGER。
+
+**适用数据类型**：任何类型。
+
+**适用于**：表和超级表。
### LEASTSQUARES
@@ -1648,6 +1728,26 @@ LEASTSQUARES(expr, start_val, step_val)
**适用于**：表。
+### PERCENTILE
+
+```sql
+PERCENTILE(expr, p [, p1] ... )
+```
+
+**功能说明**：统计表中某列的值百分比分位数。
+
+**返回数据类型**：该函数最小参数个数为 2 个，最大参数个数为 11 个。可以最多同时返回 10 个百分比分位数。当参数个数为 2 时，返回一个分位数，类型为DOUBLE，当参数个数大于 2 时，返回类型为VARCHAR，格式为包含多个返回值的JSON数组。
+
+**应用字段**：数值类型。
+
+**适用于**：表。
+
+**使用说明**：
+
+- *P* 值取值范围 0≤*P*≤100，为 0 的时候等同于 MIN，为 100 的时候等同于 MAX;
+- 同时计算针对同一列的多个分位数时，建议使用一个 PERCENTILE 函数和多个参数的方式，能很大程度上降低查询的响应时间。
+ 比如，使用查询 `SELECT percentile(col, 90, 95, 99) FROM table`，性能会优于 `SELECT percentile(col, 90), percentile(col, 95), percentile(col, 99) from table`。
+
### SPREAD
```sql
@@ -1696,7 +1796,23 @@ taos> select stddev_pop(id) from test_stddev;
============================
1.414213562373095 |
```
+
+### SUM
+
+```sql
+SUM(expr)
+```
+
+**功能说明**：统计表/超级表中某列的和。
+
+**返回数据类型**：DOUBLE、BIGINT。
+
+**适用数据类型**：数值类型。
+
+**适用于**：表和超级表。
+
### VAR_POP
+
```sql
VAR_POP(expr)
```
@@ -1727,88 +1843,6 @@ taos> select var_pop(id) from test_var;
============================
2.000000000000000 |
```
-### SUM
-
-```sql
-SUM(expr)
-```
-
-**功能说明**：统计表/超级表中某列的和。
-
-**返回数据类型**：DOUBLE、BIGINT。
-
-**适用数据类型**：数值类型。
-
-**适用于**：表和超级表。
-
-
-### HYPERLOGLOG
-
-```sql
-HYPERLOGLOG(expr)
-```
-
-**功能说明**：
- - 采用 hyperloglog 算法，返回某列的基数。该算法在数据量很大的情况下，可以明显降低内存的占用，求出来的基数是个估算值，标准误差（标准误差是多次实验，每次的平均数的标准差，不是与真实结果的误差）为 0.81%。
- - 在数据量较少的时候该算法不是很准确，可以使用 `select count(data) from (select unique(col) as data from table)` 的方法。
-
-**返回结果类型**：INTEGER。
-
-**适用数据类型**：任何类型。
-
-**适用于**：表和超级表。
-
-
-### HISTOGRAM
-
-```sql
-HISTOGRAM(expr，bin_type, bin_description, normalized)
-```
-
-**功能说明**：统计数据按照用户指定区间的分布。
-
-**返回结果类型**：如归一化参数 normalized 设置为 1，返回结果为 DOUBLE 类型，否则为 BIGINT 类型。
-
-**适用数据类型**：数值型字段。
-
-**适用于**：表和超级表。
-
-**详细说明**：
-- bin_type 用户指定的分桶类型，有效输入类型为 "user_input"、"linear_bin"、"log_bin"。
-- bin_description 描述如何生成分桶区间，针对三种桶类型，分别为以下描述格式(均为 JSON 格式字符串)：
- - "user_input": "[1, 3, 5, 7]"
- 用户指定 bin 的具体数值。
-
- - "linear_bin": "\{"start": 0.0, "width": 5.0, "count": 5, "infinity": true}"
- "start" 表示数据起始点，"width" 表示每次 bin 偏移量，"count" 为 bin 的总数，"infinity" 表示是否添加（-inf, inf）作为区间起点和终点，
- 生成区间为[-inf, 0.0, 5.0, 10.0, 15.0, 20.0, +inf]。
-
- - "log_bin": "\{"start":1.0, "factor": 2.0, "count": 5, "infinity": true}"
- "start" 表示数据起始点，"factor" 表示按指数递增的因子，"count" 为 bin 的总数，"infinity" 表示是否添加（-inf, inf）作为区间起点和终点，
- 生成区间为[-inf, 1.0, 2.0, 4.0, 8.0, 16.0, +inf]。
-- normalized 是否将返回结果归一化到 0~1 之间。有效输入为 0 和 1。
-
-
-### PERCENTILE
-
-```sql
-PERCENTILE(expr, p [, p1] ... )
-```
-
-**功能说明**：统计表中某列的值百分比分位数。
-
-**返回数据类型**：该函数最小参数个数为 2 个，最大参数个数为 11 个。可以最多同时返回 10 个百分比分位数。当参数个数为 2 时，返回一个分位数，类型为DOUBLE，当参数个数大于 2 时，返回类型为VARCHAR，格式为包含多个返回值的JSON数组。
-
-**应用字段**：数值类型。
-
-**适用于**：表。
-
-**使用说明**：
-
-- *P* 值取值范围 0≤*P*≤100，为 0 的时候等同于 MIN，为 100 的时候等同于 MAX;
-- 同时计算针对同一列的多个分位数时，建议使用一个 PERCENTILE 函数和多个参数的方式，能很大程度上降低查询的响应时间。
- 比如，使用查询 `SELECT percentile(col, 90, 95, 99) FROM table`，性能会优于 `SELECT percentile(col, 90), percentile(col, 95), percentile(col, 99) from table`。
-
## 选择函数
@@ -1912,7 +1946,6 @@ LAST(expr)
- 在用于超级表时，时间戳完全一样且同为最大的数据行可能有多个，那么会从中随机返回一条，而并不保证多次运行所挑选的数据行必然一致。
- 对于存在复合主键的表的查询，若最大时间戳的数据有多条，则只有对应的复合主键最大的数据被返回。
-
### LAST_ROW
```sql
@@ -1981,7 +2014,6 @@ MODE(expr)
**适用于**：表和超级表。
-
### SAMPLE
```sql
@@ -1998,7 +2030,6 @@ SAMPLE(expr, k)
**适用于**：表和超级表。
-
### TAIL
```sql
@@ -2015,7 +2046,6 @@ TAIL(expr, k [, offset_rows])
**适用于**：表、超级表。
-
### TOP
```sql
@@ -2093,11 +2123,9 @@ CSUM(expr)
**适用于**：表和超级表。
**使用说明**：
-
- 不支持 +、-、*、/ 运算，如 csum(col1) + csum(col2)。
- 只能与聚合（Aggregation）函数一起使用。该函数可以应用在普通表和超级表上。
-
### DERIVATIVE
```sql
@@ -2173,7 +2201,6 @@ IRATE(expr)
**适用于**：表和超级表。
-
### MAVG
```sql
@@ -2195,7 +2222,6 @@ MAVG(expr, k)
- 不支持 +、-、*、/ 运算，如 mavg(col1, k1) + mavg(col2, k1);
- 只能与普通列，选择（Selection）、投影（Projection）函数一起使用，不能与聚合（Aggregation）函数一起使用；
-
### STATECOUNT
```sql
@@ -2221,7 +2247,6 @@ STATECOUNT(expr, oper, val)
- 不能和窗口操作一起使用，例如 `interval/state_window/session_window`。
-
### STATEDURATION
```sql
@@ -2248,7 +2273,6 @@ STATEDURATION(expr, oper, val, unit)
- 不能和窗口操作一起使用，例如 interval、state_window、session_window。
-
### TWA
```sql
@@ -2263,18 +2287,8 @@ TWA(expr)
**适用于**：表和超级表。
-
## 系统信息函数
-### DATABASE
-
-```sql
-SELECT DATABASE();
-```
-
-**说明**：返回当前登录的数据库。如果登录的时候没有指定默认数据库，且没有使用 USE 命令切换数据库，则返回 NULL。
-
-
### CLIENT_VERSION
```sql
@@ -2283,13 +2297,21 @@ SELECT CLIENT_VERSION();
**说明**：返回客户端版本。
-### SERVER_VERSION
+### CURRENT_USER
```sql
-SELECT SERVER_VERSION();
+SELECT CURRENT_USER();
```
-**说明**：返回服务端版本。
+**说明**：获取当前用户。
+
+### DATABASE
+
+```sql
+SELECT DATABASE();
+```
+
+**说明**：返回当前登录的数据库。如果登录的时候没有指定默认数据库，且没有使用 USE 命令切换数据库，则返回 NULL。
### SERVER_STATUS
@@ -2299,14 +2321,13 @@ SELECT SERVER_STATUS();
**说明**：检测服务端是否所有 dnode 都在线，如果是则返回成功，否则返回无法建立连接的错误。如果想要查询集群的状态，推荐使用 `SHOW CLUSTER ALIVE` 与 `SELECT SERVER_STATUS()` 不同，当集群中的部分节点不可用时，它不会返回错误，而是返回不同的状态码，详见：[SHOW CLUSTER ALIVE](https://docs.taosdata.com/reference/taos-sql/show/#show-cluster-alive)
-### CURRENT_USER
+### SERVER_VERSION
```sql
-SELECT CURRENT_USER();
+SELECT SERVER_VERSION();
```
-**说明**：获取当前用户。
-
+**说明**：返回服务端版本。
## Geometry 函数
@@ -2348,70 +2369,6 @@ ST_AsText(GEOMETRY geom)
### Geometry 关系函数
-#### ST_Intersects
-
-```sql
-ST_Intersects(GEOMETRY geomA, GEOMETRY geomB)
-```
-
-##功能说明**：比较两个几何对象，并在它们相交时返回 true。
-
-**返回值类型**：BOOL。
-
-**适用数据类型**：GEOMETRY、GEOMETRY。
-
-**适用表类型**：标准表和超表。
-
-**使用说明**：如果两个几何对象有任何一个共享点，则它们相交。
-
-#### ST_Equals
-
-```sql
-ST_Equals(GEOMETRY geomA, GEOMETRY geomB)
-```
-
-**功能说明**：如果给定的几何对象是“空间相等”的，则返回 TRUE。
-
-**返回值类型**：BOOL。
-
-**适用数据类型**：GEOMETRY、GEOMETRY。
-
-**适用表类型**：标准表和超表。
-
-**使用说明**："空间相等"意味着 ST_Contains(A,B) = true 和 ST_Contains(B,A) = true，并且点的顺序可能不同，但表示相同的几何结构。
-
-#### ST_Touches
-
-```sql
-ST_Touches(GEOMETRY geomA, GEOMETRY geomB)
-```
-
-**功能说明**：如果 A 和 B 相交，但它们的内部不相交，则返回 TRUE。
-
-**返回值类型**：BOOL。
-
-**适用数据类型**：GEOMETRY、GEOMETRY。
-
-**适用表类型**：标准表和超表。
-
-**使用说明**：A 和 B 至少有一个公共点，并且这些公共点位于至少一个边界中。对于点/点输入，关系始终为 FALSE，因为点没有边界。
-
-#### ST_Covers
-
-```sql
-ST_Covers(GEOMETRY geomA, GEOMETRY geomB)
-```
-
-**功能说明**：如果 B 中的每个点都位于几何形状 A 内部（与内部或边界相交），则返回 TRUE。
-
-**返回值类型**：BOOL。
-
-**适用数据类型**：GEOMETRY、GEOMETRY。
-
-**适用表类型**：标准表和超表。
-
-**使用说明**：A 包含 B 意味着 B 中的没有点位于 A 的外部（在外部）。
-
#### ST_Contains
```sql
@@ -2443,3 +2400,68 @@ ST_ContainsProperly(GEOMETRY geomA, GEOMETRY geomB)
**适用表类型**：标准表和超表。
**使用说明**：B 的没有点位于 A 的边界或外部。
+
+#### ST_Covers
+
+```sql
+ST_Covers(GEOMETRY geomA, GEOMETRY geomB)
+```
+
+**功能说明**：如果 B 中的每个点都位于几何形状 A 内部（与内部或边界相交），则返回 TRUE。
+
+**返回值类型**：BOOL。
+
+**适用数据类型**：GEOMETRY、GEOMETRY。
+
+**适用表类型**：标准表和超表。
+
+**使用说明**：A 包含 B 意味着 B 中的没有点位于 A 的外部（在外部）。
+
+#### ST_Equals
+
+```sql
+ST_Equals(GEOMETRY geomA, GEOMETRY geomB)
+```
+
+**功能说明**：如果给定的几何对象是"空间相等"的，则返回 TRUE。
+
+**返回值类型**：BOOL。
+
+**适用数据类型**：GEOMETRY、GEOMETRY。
+
+**适用表类型**：标准表和超表。
+
+**使用说明**："空间相等"意味着 ST_Contains(A,B) = true 和 ST_Contains(B,A) = true，并且点的顺序可能不同，但表示相同的几何结构。
+
+
+#### ST_Intersects
+
+```sql
+ST_Intersects(GEOMETRY geomA, GEOMETRY geomB)
+```
+
+##功能说明**：比较两个几何对象，并在它们相交时返回 true。
+
+**返回值类型**：BOOL。
+
+**适用数据类型**：GEOMETRY、GEOMETRY。
+
+**适用表类型**：标准表和超表。
+
+**使用说明**：如果两个几何对象有任何一个共享点，则它们相交。
+
+#### ST_Touches
+
+```sql
+ST_Touches(GEOMETRY geomA, GEOMETRY geomB)
+```
+
+**功能说明**：如果 A 和 B 相交，但它们的内部不相交，则返回 TRUE。
+
+**返回值类型**：BOOL。
+
+**适用数据类型**：GEOMETRY、GEOMETRY。
+
+**适用表类型**：标准表和超表。
+
+**使用说明**：A 和 B 至少有一个公共点，并且这些公共点位于至少一个边界中。对于点/点输入，关系始终为 FALSE，因为点没有边界。
diff --git a/docs/zh/27-train-faq/02-dst.md b/docs/zh/27-train-faq/02-dst.md
new file mode 100644
index 0000000000..5c430fd42f
--- /dev/null
+++ b/docs/zh/27-train-faq/02-dst.md
@@ -0,0 +1,291 @@
+---
+title: 夏令时使用指南
+description: TDengine 中关于夏令时使用问题的解释和建议
+---
+
+## 背景
+
+在时序数据库的使用中，有时会遇到使用夏令时的情况。我们将 TDengine 中使用夏令时的情况和问题进行分析说明，以便您在 TDengine 的使用中更加顺利。
+
+## 定义
+
+### 时区
+
+时区是地球上使用相同标准时间的区域。由于地球的自转，为了保证各地的时间与当地的日出日落相协调，全球划分为多个时区。
+
+### IANA 时区
+
+IANA（Internet Assigned Numbers Authority）时区数据库，也称为 tz database，提供全球时区信息的标准参考。它是现代各类系统和软件处理时区相关操作的基础。
+
+IANA 使用“区域/城市”格式（如 Europe/Berlin）来明确标识时区。
+
+TDengine 在不同组件中均支持使用 IANA 时区（除 Windows taos.cfg 时区设置外）。
+
+### 标准时间与当地时间
+
+标准时间是根据地球上某个固定经线确定的时间。它为各个时区提供了一个统一的参考点。
+
+- 格林尼治标准时间（GMT）：历史上使用的参考时间，位于 0° 经线。
+- 协调世界时（UTC）：现代的时间标准，类似于GMT，但更加精确。
+
+标准时间与时区的关系如下：
+
+- 基准：标准时间（如 UTC）是时区设定的基准点。
+- 偏移量：不同时区通过相对于标准时间的偏移量来定义。例如，UTC+1 表示比 UTC 快 1 小时。
+- 区域划分：全球被划分为多个时区，每个时区使用一个或多个标准时间。
+
+相对于标准时间，每个地区根据其所在时区设定其当地时间：
+
+- 时区偏移：当地时间等于标准时间加上该时区的偏移量。例如，UTC+2 表示比 UTC 时间快 2 小时。
+- 夏令时（DST）：某些地区在特定时间段调整当地时间，例如将时钟拨快一小时。详见下节。
+
+### 夏令时
+
+夏令时（Daylight Saving Time，DST）是一种通过将时间提前一小时，以充分利用日光、节约能源的制度。通常在春季开始，秋季结束。夏令时的具体开始和结束时间因地区而异。以下均以柏林时间为例，对夏令时和夏令时的影响做说明。
+
+按照这个规则，可以看到：
+
+- 柏林当地时间 2024 年 03 月 31 日 02:00:00 到 03:00:00 （不含 03:00:00）之间的时间不存在（跳变）。
+- 柏林当地时间 2024 年 10 月 27 日 02:00:00 到 03:00:00 （不含 03:00:00）之间的时间出现了两次。
+
+#### 夏令时与 IANA 时区数据库
+
+- 记录规则：IANA 时区数据库详细记录了各地的夏令时规则，包括开始和结束的日期与时间。
+- 自动调整：许多操作系统和软件利用 IANA 数据库来自动处理夏令时的调整。
+- 历史变更：IANA 数据库还追踪历史上的夏令时变化，以确保准确性。
+
+#### 夏令时与时间戳转换
+
+- 时间戳转为当地时间是确定的。例如，1729990654 为柏林时间**夏令时** `2024-10-27 02:57:34`，1729994254 为柏林时间**冬令时** `2024-10-27 02:57:34`（这两个本地时间除时间偏移量外是一样的）。
+- 不指定时间偏移量时，当地时间转为时间戳是不确定的。夏令时跳过的时间不存在会造成无法转换成时间戳，如 **柏林时间** `2024-03-31 02:34:56` 不存在，所以无法转换为时间戳。夏令时结束时重复导致无法确定是哪个时间戳，如 `2024-10-27 02:57:34` 不指定时间偏移量无法确定 是 1729990654 还是 1729994254。指定时间偏移量才能确定时间戳，如 `2024-10-27 02:57:34 CEST(+02:00) `，指定了夏令时 `2024-10-27 02:57:34` 时间戳 1729990654 。
+
+### RFC3339 时间格式
+
+RFC 3339 是一种互联网时间格式标准，用于表示日期和时间。它基于 ISO 8601 标准，但更具体地规定了一些格式细节。
+
+其格式如下：
+
+- 基本格式：`YYYY-MM-DDTHH:MM:SSZ`
+- 时区表示：
+ - Z 表示协调世界时（UTC）。
+ - 偏移量格式，例如 +02:00，表示与 UTC 的时差。
+
+通过明确的时区偏移，RFC 3339 格式可以在全球范围内准确地解析和比较时间。
+
+RFC 3339 的优势包括：
+
+- 标准化：提供统一的格式，方便跨系统数据交换。
+- 清晰性：明确时区信息，避免时间误解。
+
+TDengine 在 REST API 和 Explorer UI 中，均使用 RFC3339 格式进行展示。在 SQL 语句中，可使用 RFC3339 格式写入时间戳数据：
+
+```sql
+insert into t1 values('2024-10-27T01:59:59.000Z', 0);
+select * from t1 where ts >= '2024-10-27T01:59:59.000Z';
+```
+
+### 未定义行为
+
+未定义行为（Undefined Behavior）是指特定代码或操作没有明确规定的结果，也不会对该结果作出兼容性的保证，TDengine 可能在某个版本后对当前的行为作出修改而不会通知用户。所以，在 TDengine 中，用户不可依赖当前未定义的行为进行判断或应用。
+
+## 夏令时在 TDengine 中的写入与查询
+
+我们使用下表来展示夏令时在写入和查询中的影响。
+
+
+
+### 表格说明
+
+- **TIMESTAMP**：TDengine 中使用 64位整数来存储原始时间戳。
+- **UTC**：时间戳对应的 UTC 时间表示。
+- **Europe/Berlin**：表示时区 Europe/Berlin 对应的 RFC3339 格式时间。
+- **Local**：表示时区 Europe/Berlin 对应的当地时间（不含时区）。
+
+### 表格分析
+
+- 在**夏令时开始**（柏林时间 3 月 31 日 02:00）时，时间直接从 02:00 跳到 03:00（往后跳一小时）。
+ - 浅绿色是夏令时开始前一小时的时间戳；
+ - 深绿色是夏令时开始后一小时的时间戳；
+ - 红色为 TDengine 数据库中插入了不存在的当地时间：
+ - 使用 SQL `INSERT INTO t1 values('2024-03-31 02:59:59',..)` 插入 `2024-03-31 02:00:00` 到 `2024-03-31 02:59:59` 的数据会被自动调整为 -1000（在 TDengine 中属于未定义行为，当前该值与数据库精度 precision 有关，毫秒数据库为 -1000，微秒数据库为 -1000000，纳秒数据库为 -1000000000），因为那一时刻在本地时间中不存在；
+- 在**夏令时结束**（柏林时间 10 月 27 日 03:00）时，时间从 03:00 跳到 02:00 （往前跳一小时）。
+ - 浅蓝色表示时钟跳变前一小时的时间戳；
+ - 深蓝色表示时钟跳变后一小时内的时间戳，其无时区的当地时间与上一小时一致。
+ - 紫色表示时钟跳变一小时后的时间戳；
+- **当地时间变化**：可见，由于夏令时的调整而导致了当地时间的变化，可能导致某些时间段出现重复或缺失。
+- **UTC 时间不变**：UTC 时间保持不变，确保了时间的一致性和顺序性。
+- **RFC3339**：RFC3339 格式时间显示了时间偏移量的变化，在夏令时开始后变为 +02:00，结束后变为 +01:00 。
+- **条件查询**：
+ - **夏令时开始**时，跳过的时间（`[03-31 02:00:00,03-31 03:00:00)`）不存在，所以在使用该时间进行查询时，行为不确定：`SELECT ts FROM t1 WHERE ts BETWEEN '2024-03-31 02:00:00' AND '2024-03-31 02:59:59'`（不存在的本地时间戳被转换为 `-1000`）:
+
+ ```sql
+ taos> SELECT ts FROM t1 WHERE ts BETWEEN '2024-03-31 02:00:00' AND '2024-03-31 02:59:59';
+ ts |
+ =================
+ -1000 |
+ Query OK, 1 row(s) in set (0.003635s)
+ ```
+
+ 当不存在的时间戳与存在的时间戳共同使用时，其结果同样不符合预期，以下为起始本地时间不存在：
+
+ ```sql
+ taos> SELECT ts, to_iso8601(ts,'Z') FROM t1 WHERE ts BETWEEN '2024-03-31 02:00:00' AND '2024-03-31 03:59:59';
+ ts | to_iso8601(ts,'Z') |
+ ==================================================
+ -1000 | 1969-12-31T23:59:59.000Z |
+ 1711843200000 | 2024-03-31T00:00:00.000Z |
+ 1711846799000 | 2024-03-31T00:59:59.000Z |
+ 1711846800000 | 2024-03-31T01:00:00.000Z |
+ 1711846801000 | 2024-03-31T01:00:01.000Z |
+ Query OK, 5 row(s) in set (0.003339s)
+ ```
+
+ 以下语句中第一个 SQL 查询截止时间不存在，第二个截止时间存在，第一个 SQL 查询结果不符合预期：
+
+ ```sql
+ taos> SELECT ts, to_iso8601(ts,'Z') FROM t1 WHERE ts BETWEEN '2024-03-31 01:00:00' AND '2024-03-31 02:00:00';
+ Query OK, 0 row(s) in set (0.000930s)
+
+ taos> SELECT ts, to_iso8601(ts,'Z') FROM t1 WHERE ts BETWEEN '2024-03-31 01:00:00' AND '2024-03-31 01:59:59';
+ ts | to_iso8601(ts,'Z') |
+ ==================================================
+ 1711843200000 | 2024-03-31T00:00:00.000Z |
+ 1711846799000 | 2024-03-31T00:59:59.000Z |
+ Query OK, 2 row(s) in set (0.001227s)
+ ```
+
+ - 夏令时结束时，跳变的时间（`[10-27 02:00:00,10-27 03:00:00)` 不包含 `10-27 03:00:00`）重复了两次，TDengine 在使用该区间内的时间戳进行查询时，也属于未定义行为。
+ - 查询 `[2024-10-27 02:00:00, 2024-10-27 03:00:00]` 之间的数据结果，包含了两次重复的时间戳和 `2024-10-27 03:00:00` 这个时间点的数据：
+
+ ```sql
+ taos> SELECT ts, to_iso8601(ts,'Z'), TO_CHAR(ts, 'YYYY-MM-DD HH:mi:ss') FROM t1 WHERE ts BETWEEN '2024-10-27 02:00:00' AND '2024-10-27 03:00:00';
+ ts | to_iso8601(ts,'Z') | to_char(ts, 'YYYY-MM-DD HH:mi:ss') |
+ =======================================================================================
+ 1729987200000 | 2024-10-27T00:00:00.000Z | 2024-10-27 02:00:00 |
+ 1729990799000 | 2024-10-27T00:59:59.000Z | 2024-10-27 02:59:59 |
+ 1729990800000 | 2024-10-27T01:00:00.000Z | 2024-10-27 02:00:00 |
+ 1729994399000 | 2024-10-27T01:59:59.000Z | 2024-10-27 02:59:59 |
+ 1729994400000 | 2024-10-27T02:00:00.000Z | 2024-10-27 03:00:00 |
+ Query OK, 5 row(s) in set (0.001370s)
+ ````
+
+ - 但以下查询 [2024-10-27 02:00:00.000,2024-10-27 02:57:34.999] 区间只能查询到第一个2024-10-27 02:00:00 时间点的数据：
+
+ ```sql
+ taos> SELECT ts, to_iso8601(ts,'Z'), TO_CHAR(ts, 'YYYY-MM-DD HH:mi:ss') FROM t1 WHERE ts >= '2024-10-27 02:00:00' AND ts <= '2024-10-27 02:57:00.999';
+ ts | to_iso8601(ts,'Z') | to_char(ts, 'YYYY-MM-DD HH:mi:ss') |
+ =======================================================================================
+ 1729987200000 | 2024-10-27T00:00:00.000Z | 2024-10-27 02:00:00 |
+ Query OK, 1 row(s) in set (0.004480s)
+ ```
+
+ - 以下查询 `[2024-10-27 02:00:01,2024-10-27 02:57:35]` 却能查到 3 条数据（包含一条 02:59:59 的当地时间数据）：
+
+ ```sql
+ taos> SELECT ts, to_iso8601(ts,'Z'), TO_CHAR(ts, 'YYYY-MM-DD HH:mi:ss') FROM t1 WHERE ts >= '2024-10-27 02:00:00' AND ts <= '2024-10-27 02:57:35';;
+ ts | to_iso8601(ts,'Z') | to_char(ts, 'YYYY-MM-DD HH:mi:ss') |
+ ================================================================================================
+ 2024-10-27 02:00:00.000 | 2024-10-27T00:00:00.000Z | 2024-10-27 02:00:00 |
+ 2024-10-27 02:59:59.000 | 2024-10-27T00:59:59.000Z | 2024-10-27 02:59:59 |
+ 2024-10-27 02:00:00.000 | 2024-10-27T01:00:00.000Z | 2024-10-27 02:00:00 |
+ Query OK, 3 row(s) in set (0.004428s)
+ ```
+
+## 总结与建议
+
+### 总结
+
+仅针对使用当地时间带来的影响作说明，使用 UNIX 时间戳或 RFC3339 无影响。
+
+- 写入：
+ - 无法写入夏令时跳变时不存在的时间数据。
+ - 写入夏令时跳变时重复的时间是未定义行为。
+- 查询：
+ - 查询条件指定夏令时开始时跳变的时间，其查询结果为未定义行为。
+ - 查询条件指定夏令时结束时重复的时间，其查询结果为未定义行为。
+- 显示：
+ - 带时区显示不受影响。
+ - 显示当地时间是准确的，但夏令时结束时重复的时间会无法区分。
+ - 用户应谨慎使用不带时区的时间进行展示和应用。
+
+### 建议
+
+为避免夏令时给查询和写入造成不必要的影响，在 TDengine 中，建议使用明确的时间偏移量进行写入和查询。
+
+- 使用 UNIX 时间戳：使用 UNIX 时间戳可避免时区问题。
+
+ | TIMESTAMP | UTC | Europe/Berlin | Local |
+ | ------------: | :----------------------: | :---------------------------: | :-----------------: |
+ | 1711846799000 | 2024-03-31T00:59:59.000Z | 2024-03-31T01:59:59.000+01:00 | 2024-03-31 01:59:59 |
+ | 1711846800000 | 2024-03-31T01:00:00.000Z | 2024-03-31T03:00:00.000+02:00 | 2024-03-31 03:00:00 |
+
+ ```sql
+ taos> insert into t1 values(1711846799000, 1)(1711846800000, 2);
+ Insert OK, 2 row(s) affected (0.001434s)
+
+ taos> select * from t1 where ts between 1711846799000 and 1711846800000;
+ ts | v1 |
+ ===============================
+ 1711846799000 | 1 |
+ 1711846800000 | 2 |
+ Query OK, 2 row(s) in set (0.003503s)
+ ```
+
+- 使用 RFC3339 时间格式：带时区偏移量的 RFC3339 时间格式可以有效避免夏令时的不确定性。
+
+ | TIMESTAMP | UTC | Europe/Berlin | Local |
+ | ------------: | :----------------------: | :---------------------------: | :-----------------: |
+ | 1729987200000 | 2024-10-27T00:00:00.000Z | 2024-10-27T02:00:00.000+02:00 | 2024-10-27 02:00:00 |
+ | 1729990799000 | 2024-10-27T00:59:59.000Z | 2024-10-27T02:59:59.000+02:00 | 2024-10-27 02:59:59 |
+ | 1729990800000 | 2024-10-27T01:00:00.000Z | 2024-10-27T02:00:00.000+01:00 | 2024-10-27 02:00:00 |
+ | 1729994399000 | 2024-10-27T01:59:59.000Z | 2024-10-27T02:59:59.000+01:00 | 2024-10-27 02:59:59 |
+
+ ```sql
+ taos> insert into t1 values ('2024-10-27T02:00:00.000+02:00', 1)
+ ('2024-10-27T02:59:59.000+02:00', 2)
+ ('2024-10-27T02:00:00.000+01:00', 3)
+ ('2024-10-27T02:59:59.000+01:00', 4);
+ Insert OK, 4 row(s) affected (0.001514s)
+
+ taos> SELECT *,
+ to_iso8601(ts,'Z'),
+ to_char(ts, 'YYYY-MM-DD HH:mi:ss') FROM t1
+ WHERE ts >= '2024-10-27T02:00:00.000+02:00'
+ AND ts <= '2024-10-27T02:59:59.000+01:00';
+ ts | v1 | to_iso8601(ts,'Z') | to_char(ts, 'YYYY-MM-DD HH:mi:ss') |
+ =====================================================================================================
+ 1729987200000 | 1 | 2024-10-27T00:00:00.000Z | 2024-10-27 02:00:00 |
+ 1729990799000 | 2 | 2024-10-27T00:59:59.000Z | 2024-10-27 02:59:59 |
+ 1729990800000 | 3 | 2024-10-27T01:00:00.000Z | 2024-10-27 02:00:00 |
+ 1729994399000 | 4 | 2024-10-27T01:59:59.000Z | 2024-10-27 02:59:59 |
+ Query OK, 4 row(s) in set (0.004275s)
+
+ taos> SELECT *,
+ to_iso8601(ts,'Z'),
+ to_char(ts, 'YYYY-MM-DD HH:mi:ss') FROM t1
+ WHERE ts >= '2024-10-27T02:00:00.000+02:00'
+ AND ts <= '2024-10-27T02:59:59.000+02:00';
+ ts | v1 | to_iso8601(ts,'Z') | to_char(ts, 'YYYY-MM-DD HH:mi:ss') |
+ =====================================================================================================
+ 1729987200000 | 1 | 2024-10-27T00:00:00.000Z | 2024-10-27 02:00:00 |
+ 1729990799000 | 2 | 2024-10-27T00:59:59.000Z | 2024-10-27 02:59:59 |
+ Query OK, 2 row(s) in set (0.004275s)
+ ```
+
+- 查询时注意时区设定：在查询和显示时，如果需要本地时间，务必考虑夏令时的影响。
+ - taosAdapter：使用 REST API 时，支持设置 IANA 时区，结果使用 RFC3339 格式返回。
+
+ ```shell
+ $ curl -uroot:taosdata 'localhost:6041/rest/sql?tz=Europe/Berlin'\
+ -d "select ts from tz1.t1"
+ {"code":0,"column_meta":[["ts","TIMESTAMP",8]],"data":[["1970-01-01T00:59:59.000+01:00"],["2024-03-31T01:00:00.000+01:00"],["2024-03-31T01:59:59.000+01:00"],["2024-03-31T03:00:00.000+02:00"],["2024-03-31T03:00:01.000+02:00"],["2024-10-27T02:00:00.000+02:00"],["2024-10-27T02:59:59.000+02:00"],["2024-10-27T02:00:00.000+01:00"],["2024-10-27T02:59:59.000+01:00"],["2024-10-27T03:00:00.000+01:00"]],"rows":10}
+ ```
+
+ - Explorer：使用 Explorer 页面进行 SQL 查询时，用户可配置客户端时区，以 RFC3339 格式显示。
+
+ 
+
+## 参考文档
+
+- IANA Time Zone Database: [https://www.iana.org/time-zones](https://www.iana.org/time-zones)
+- RFC3339: [https://datatracker.ietf.org/doc/html/rfc3339](https://datatracker.ietf.org/doc/html/rfc3339)
diff --git a/docs/zh/27-train-faq/02-dst/dst-berlin.png b/docs/zh/27-train-faq/02-dst/dst-berlin.png
new file mode 100644
index 0000000000..8c64626dd0
Binary files /dev/null and b/docs/zh/27-train-faq/02-dst/dst-berlin.png differ
diff --git a/docs/zh/27-train-faq/02-dst/dst-table.png b/docs/zh/27-train-faq/02-dst/dst-table.png
new file mode 100644
index 0000000000..f5eddbe010
Binary files /dev/null and b/docs/zh/27-train-faq/02-dst/dst-table.png differ
diff --git a/docs/zh/27-train-faq/02-dst/explorer-with-tz.png b/docs/zh/27-train-faq/02-dst/explorer-with-tz.png
new file mode 100644
index 0000000000..95758f117a
Binary files /dev/null and b/docs/zh/27-train-faq/02-dst/explorer-with-tz.png differ
diff --git a/include/common/tanalytics.h b/include/common/tanalytics.h
index 42c3ce9391..0fb1d543f7 100644
--- a/include/common/tanalytics.h
+++ b/include/common/tanalytics.h
@@ -25,12 +25,13 @@
extern "C" {
#endif
-#define ANALY_FORECAST_DEFAULT_ROWS 10
-#define ANALY_FORECAST_DEFAULT_CONF 95
-#define ANALY_FORECAST_DEFAULT_WNCHECK 1
-#define ANALY_FORECAST_MAX_HISTORY_ROWS 40000
-#define ANALY_MAX_FC_ROWS 1024
-#define ANALY_ANOMALY_WINDOW_MAX_ROWS 40000
+#define ANALY_FORECAST_DEFAULT_ROWS 10
+#define ANALY_FORECAST_DEFAULT_CONF 95
+#define ANALY_FORECAST_DEFAULT_WNCHECK 1
+#define ANALY_FORECAST_MAX_ROWS 40000
+#define ANALY_ANOMALY_WINDOW_MAX_ROWS 40000
+#define ANALY_DEFAULT_TIMEOUT 60
+#define ANALY_MAX_TIMEOUT 600
typedef struct {
EAnalAlgoType type;
@@ -48,7 +49,7 @@ typedef enum {
typedef enum {
ANALYTICS_HTTP_TYPE_GET = 0,
ANALYTICS_HTTP_TYPE_POST,
-} EAnalHttpType;
+} EAnalyHttpType;
typedef struct {
TdFilePtr filePtr;
@@ -66,7 +67,7 @@ typedef struct {
int32_t taosAnalyticsInit();
void taosAnalyticsCleanup();
-SJson *taosAnalySendReqRetJson(const char *url, EAnalHttpType type, SAnalyticBuf *pBuf);
+SJson *taosAnalySendReqRetJson(const char *url, EAnalyHttpType type, SAnalyticBuf *pBuf, int64_t timeout);
int32_t taosAnalyGetAlgoUrl(const char *algoName, EAnalAlgoType type, char *url, int32_t urlLen);
bool taosAnalyGetOptStr(const char *option, const char *optName, char *optValue, int32_t optMaxLen);
diff --git a/include/common/tglobal.h b/include/common/tglobal.h
index 8acff4e04b..8e9367d7c2 100644
--- a/include/common/tglobal.h
+++ b/include/common/tglobal.h
@@ -299,6 +299,7 @@ extern bool tsStreamCoverage;
extern int8_t tsS3EpNum;
extern int32_t tsStreamNotifyMessageSize;
extern int32_t tsStreamNotifyFrameSize;
+extern bool tsCompareAsStrInGreatest;
extern bool tsExperimental;
// #define NEEDTO_COMPRESSS_MSG(size) (tsCompressMsgSize != -1 && (size) > tsCompressMsgSize)
diff --git a/include/common/tmsgcb.h b/include/common/tmsgcb.h
index cdff5aaba2..4af223b537 100644
--- a/include/common/tmsgcb.h
+++ b/include/common/tmsgcb.h
@@ -40,6 +40,7 @@ typedef enum {
ARB_QUEUE,
STREAM_CTRL_QUEUE,
STREAM_LONG_EXEC_QUEUE,
+ STREAM_CHKPT_QUEUE,
QUEUE_MAX,
} EQueueType;
diff --git a/include/common/tmsgdef.h b/include/common/tmsgdef.h
index 13a26910c1..2b367939ff 100644
--- a/include/common/tmsgdef.h
+++ b/include/common/tmsgdef.h
@@ -355,6 +355,7 @@
TD_DEF_MSG_TYPE(TDMT_STREAM_DROP, "stream-drop", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_STREAM_RETRIEVE_TRIGGER, "stream-retri-trigger", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_STREAM_CONSEN_CHKPT, "stream-consen-chkpt", NULL, NULL)
+ TD_DEF_MSG_TYPE(TDMT_STREAM_CHKPT_EXEC, "stream-exec-chkpt", NULL, NULL)
TD_CLOSE_MSG_SEG(TDMT_STREAM_MSG)
TD_NEW_MSG_SEG(TDMT_MON_MSG) //5 << 8
diff --git a/include/common/ttypes.h b/include/common/ttypes.h
index d0cddd87a9..95fe14e572 100644
--- a/include/common/ttypes.h
+++ b/include/common/ttypes.h
@@ -276,6 +276,9 @@ typedef struct {
#define IS_STR_DATA_TYPE(t) \
(((t) == TSDB_DATA_TYPE_VARCHAR) || ((t) == TSDB_DATA_TYPE_VARBINARY) || ((t) == TSDB_DATA_TYPE_NCHAR))
+#define IS_COMPARE_STR_DATA_TYPE(t) \
+ (((t) == TSDB_DATA_TYPE_VARCHAR) || ((t) == TSDB_DATA_TYPE_NCHAR))
+
#define IS_VALID_TINYINT(_t) ((_t) >= INT8_MIN && (_t) <= INT8_MAX)
#define IS_VALID_SMALLINT(_t) ((_t) >= INT16_MIN && (_t) <= INT16_MAX)
#define IS_VALID_INT(_t) ((_t) >= INT32_MIN && (_t) <= INT32_MAX)
diff --git a/include/libs/function/functionMgt.h b/include/libs/function/functionMgt.h
index 41b5d76371..1949081993 100644
--- a/include/libs/function/functionMgt.h
+++ b/include/libs/function/functionMgt.h
@@ -90,6 +90,8 @@ typedef enum EFunctionType {
FUNCTION_TYPE_DEGREES,
FUNCTION_TYPE_RADIANS,
FUNCTION_TYPE_TRUNCATE,
+ FUNCTION_TYPE_GREATEST,
+ FUNCTION_TYPE_LEAST,
// string function
FUNCTION_TYPE_LENGTH = 1500,
diff --git a/include/libs/scalar/filter.h b/include/libs/scalar/filter.h
index a98bf29afb..99f1759a7a 100644
--- a/include/libs/scalar/filter.h
+++ b/include/libs/scalar/filter.h
@@ -66,6 +66,8 @@ int32_t filterPartitionCond(SNode **pCondition, SNode **pPrimaryKeyCond, SNode *
SNode **pOtherCond);
int32_t filterIsMultiTableColsCond(SNode *pCond, bool *res);
EConditionType filterClassifyCondition(SNode *pNode);
+int32_t filterGetCompFunc(__compar_fn_t *func, int32_t type, int32_t optr);
+bool filterDoCompare(__compar_fn_t func, uint8_t optr, void *left, void *right);
#ifdef __cplusplus
}
diff --git a/include/libs/scalar/scalar.h b/include/libs/scalar/scalar.h
index 67fd954ad7..d1dda544ae 100644
--- a/include/libs/scalar/scalar.h
+++ b/include/libs/scalar/scalar.h
@@ -44,6 +44,7 @@ int32_t scalarGenerateSetFromList(void **data, void *pNode, uint32_t type, int8_
int32_t vectorGetConvertType(int32_t type1, int32_t type2);
int32_t vectorConvertSingleColImpl(const SScalarParam *pIn, SScalarParam *pOut, int32_t *overflow, int32_t startIndex, int32_t numOfRows);
+int32_t vectorConvertSingleCol(SScalarParam *input, SScalarParam *output, int32_t type, int32_t startIndex, int32_t numOfRows);
/* Math functions */
int32_t absFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
@@ -71,6 +72,8 @@ int32_t signFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
int32_t degreesFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
int32_t radiansFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
int32_t randFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
+int32_t greatestFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
+int32_t leastFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
/* String functions */
int32_t lengthFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
diff --git a/include/libs/stream/tstream.h b/include/libs/stream/tstream.h
index 372322c0b8..bdb8bde2da 100644
--- a/include/libs/stream/tstream.h
+++ b/include/libs/stream/tstream.h
@@ -702,8 +702,8 @@ int32_t streamTaskClearHTaskAttr(SStreamTask* pTask, int32_t clearRelHalt);
int32_t streamExecTask(SStreamTask* pTask);
int32_t streamResumeTask(SStreamTask* pTask);
-int32_t streamTrySchedExec(SStreamTask* pTask);
-int32_t streamTaskSchedTask(SMsgCb* pMsgCb, int32_t vgId, int64_t streamId, int32_t taskId, int32_t execType);
+int32_t streamTrySchedExec(SStreamTask* pTask, bool chkptExec);
+int32_t streamTaskSchedTask(SMsgCb* pMsgCb, int32_t vgId, int64_t streamId, int32_t taskId, int32_t execType, bool chkptExec);
void streamTaskResumeInFuture(SStreamTask* pTask);
void streamTaskClearSchedIdleInfo(SStreamTask* pTask);
void streamTaskSetIdleInfo(SStreamTask* pTask, int32_t idleTime);
diff --git a/source/client/src/clientEnv.c b/source/client/src/clientEnv.c
index 266bd4a618..986874c5bb 100644
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
@@ -27,6 +27,7 @@
#include "scheduler.h"
#include "tcache.h"
#include "tcompare.h"
+#include "tconv.h"
#include "tglobal.h"
#include "thttp.h"
#include "tmsg.h"
@@ -36,7 +37,6 @@
#include "tsched.h"
#include "ttime.h"
#include "tversion.h"
-#include "tconv.h"
#include "cus_name.h"
@@ -63,13 +63,13 @@
} \
} while (0)
-STscDbg tscDbg = {0};
-SAppInfo appInfo;
-int64_t lastClusterId = 0;
-int32_t clientReqRefPool = -1;
-int32_t clientConnRefPool = -1;
-int32_t clientStop = -1;
-SHashObj* pTimezoneMap = NULL;
+STscDbg tscDbg = {0};
+SAppInfo appInfo;
+int64_t lastClusterId = 0;
+int32_t clientReqRefPool = -1;
+int32_t clientConnRefPool = -1;
+int32_t clientStop = -1;
+SHashObj *pTimezoneMap = NULL;
int32_t timestampDeltaLimit = 900; // s
@@ -964,7 +964,7 @@ void taos_init_imp(void) {
ENV_ERR_RET(taosInitCfg(configDir, NULL, NULL, NULL, NULL, 1), "failed to init cfg");
initQueryModuleMsgHandle();
- if ((tsCharsetCxt = taosConvInit(tsCharset)) == NULL){
+ if ((tsCharsetCxt = taosConvInit(tsCharset)) == NULL) {
tscInitRes = terrno;
tscError("failed to init conv");
return;
diff --git a/source/common/src/tanalytics.c b/source/common/src/tanalytics.c
index deb68af3ea..397accc0b1 100644
--- a/source/common/src/tanalytics.c
+++ b/source/common/src/tanalytics.c
@@ -276,7 +276,7 @@ _OVER:
return code;
}
-static int32_t taosCurlPostRequest(const char *url, SCurlResp *pRsp, const char *buf, int32_t bufLen) {
+static int32_t taosCurlPostRequest(const char *url, SCurlResp *pRsp, const char *buf, int32_t bufLen, int32_t timeout) {
struct curl_slist *headers = NULL;
CURL *curl = NULL;
CURLcode code = 0;
@@ -292,7 +292,7 @@ static int32_t taosCurlPostRequest(const char *url, SCurlResp *pRsp, const char
if (curl_easy_setopt(curl, CURLOPT_URL, url) != 0) goto _OVER;
if (curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, taosCurlWriteData) != 0) goto _OVER;
if (curl_easy_setopt(curl, CURLOPT_WRITEDATA, pRsp) != 0) goto _OVER;
- if (curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, 60000) != 0) goto _OVER;
+ if (curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, timeout) != 0) goto _OVER;
if (curl_easy_setopt(curl, CURLOPT_POST, 1) != 0) goto _OVER;
if (curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, bufLen) != 0) goto _OVER;
if (curl_easy_setopt(curl, CURLOPT_POSTFIELDS, buf) != 0) goto _OVER;
@@ -311,7 +311,7 @@ _OVER:
return code;
}
-SJson *taosAnalySendReqRetJson(const char *url, EAnalHttpType type, SAnalyticBuf *pBuf) {
+SJson *taosAnalySendReqRetJson(const char *url, EAnalyHttpType type, SAnalyticBuf *pBuf, int64_t timeout) {
int32_t code = -1;
char *pCont = NULL;
int64_t contentLen;
@@ -329,7 +329,7 @@ SJson *taosAnalySendReqRetJson(const char *url, EAnalHttpType type, SAnalyticBuf
terrno = code;
goto _OVER;
}
- if (taosCurlPostRequest(url, &curlRsp, pCont, contentLen) != 0) {
+ if (taosCurlPostRequest(url, &curlRsp, pCont, contentLen, timeout) != 0) {
terrno = TSDB_CODE_ANA_URL_CANT_ACCESS;
goto _OVER;
}
@@ -767,7 +767,7 @@ static int32_t taosAnalyBufGetCont(SAnalyticBuf *pBuf, char **ppCont, int64_t *p
int32_t taosAnalyticsInit() { return 0; }
void taosAnalyticsCleanup() {}
-SJson *taosAnalySendReqRetJson(const char *url, EAnalHttpType type, SAnalyticBuf *pBuf) { return NULL; }
+SJson *taosAnalySendReqRetJson(const char *url, EAnalyHttpType type, SAnalyticBuf *pBuf, int64_t timeout) { return NULL; }
int32_t taosAnalyGetAlgoUrl(const char *algoName, EAnalAlgoType type, char *url, int32_t urlLen) { return 0; }
bool taosAnalyGetOptStr(const char *option, const char *optName, char *optValue, int32_t optMaxLen) { return true; }
diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index 00f9504bc9..756d03fd8a 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -14,12 +14,12 @@
*/
#define _DEFAULT_SOURCE
+#include "tglobal.h"
#include "cJSON.h"
#include "defines.h"
#include "os.h"
#include "osString.h"
#include "tconfig.h"
-#include "tglobal.h"
#include "tgrant.h"
#include "tjson.h"
#include "tlog.h"
@@ -28,7 +28,6 @@
#include "tutil.h"
-
#define CONFIG_PATH_LEN (TSDB_FILENAME_LEN + 12)
#define CONFIG_FILE_LEN (CONFIG_PATH_LEN + 32)
@@ -117,9 +116,9 @@ bool tsMndSkipGrant = false;
bool tsEnableWhiteList = false; // ip white list cfg
// arbitrator
-int32_t tsArbHeartBeatIntervalSec = 5;
-int32_t tsArbCheckSyncIntervalSec = 10;
-int32_t tsArbSetAssignedTimeoutSec = 30;
+int32_t tsArbHeartBeatIntervalSec = 2;
+int32_t tsArbCheckSyncIntervalSec = 3;
+int32_t tsArbSetAssignedTimeoutSec = 6;
// dnode
int64_t tsDndStart = 0;
@@ -131,6 +130,8 @@ uint32_t tsEncryptionKeyChksum = 0;
int8_t tsEncryptionKeyStat = ENCRYPT_KEY_STAT_UNSET;
int8_t tsGrant = 1;
+bool tsCompareAsStrInGreatest = true;
+
// monitor
bool tsEnableMonitor = true;
int32_t tsMonitorInterval = 30;
@@ -501,9 +502,7 @@ int32_t taosSetS3Cfg(SConfig *pCfg) {
TAOS_RETURN(TSDB_CODE_SUCCESS);
}
-struct SConfig *taosGetCfg() {
- return tsCfg;
-}
+struct SConfig *taosGetCfg() { return tsCfg; }
static int32_t taosLoadCfg(SConfig *pCfg, const char **envCmd, const char *inputCfgDir, const char *envFile,
char *apolloUrl) {
@@ -692,7 +691,7 @@ static int32_t taosAddClientCfg(SConfig *pCfg) {
CFG_DYN_CLIENT, CFG_CATEGORY_LOCAL));
TAOS_CHECK_RETURN(cfgAddInt32(pCfg, "maxInsertBatchRows", tsMaxInsertBatchRows, 1, INT32_MAX, CFG_SCOPE_CLIENT,
CFG_DYN_CLIENT, CFG_CATEGORY_LOCAL) != 0);
- TAOS_CHECK_RETURN(cfgAddInt32(pCfg, "maxRetryWaitTime", tsMaxRetryWaitTime, 0, 86400000, CFG_SCOPE_SERVER,
+ TAOS_CHECK_RETURN(cfgAddInt32(pCfg, "maxRetryWaitTime", tsMaxRetryWaitTime, 3000, 86400000, CFG_SCOPE_SERVER,
CFG_DYN_BOTH_LAZY, CFG_CATEGORY_GLOBAL));
TAOS_CHECK_RETURN(cfgAddBool(pCfg, "useAdapter", tsUseAdapter, CFG_SCOPE_CLIENT, CFG_DYN_CLIENT, CFG_CATEGORY_LOCAL));
TAOS_CHECK_RETURN(
@@ -749,6 +748,8 @@ static int32_t taosAddClientCfg(SConfig *pCfg) {
TAOS_CHECK_RETURN(
cfgAddBool(pCfg, "streamCoverage", tsStreamCoverage, CFG_DYN_CLIENT, CFG_DYN_CLIENT, CFG_CATEGORY_LOCAL));
+
+ TAOS_CHECK_RETURN(cfgAddBool(pCfg, "compareAsStrInGreatest", tsCompareAsStrInGreatest, CFG_SCOPE_CLIENT, CFG_DYN_CLIENT,CFG_CATEGORY_LOCAL));
TAOS_RETURN(TSDB_CODE_SUCCESS);
}
@@ -1483,6 +1484,9 @@ static int32_t taosSetClientCfg(SConfig *pCfg) {
TAOS_CHECK_GET_CFG_ITEM(pCfg, pItem, "streamCoverage");
tsStreamCoverage = pItem->bval;
+ TAOS_CHECK_GET_CFG_ITEM(pCfg, pItem, "compareAsStrInGreatest");
+ tsCompareAsStrInGreatest = pItem->bval;
+
TAOS_RETURN(TSDB_CODE_SUCCESS);
}
@@ -2786,7 +2790,8 @@ static int32_t taosCfgDynamicOptionsForClient(SConfig *pCfg, const char *name) {
{"numOfRpcSessions", &tsNumOfRpcSessions},
{"bypassFlag", &tsBypassFlag},
{"safetyCheckLevel", &tsSafetyCheckLevel},
- {"streamCoverage", &tsStreamCoverage}};
+ {"streamCoverage", &tsStreamCoverage},
+ {"compareAsStrInGreatest", &tsCompareAsStrInGreatest}};
if ((code = taosCfgSetOption(debugOptions, tListLen(debugOptions), pItem, true)) != TSDB_CODE_SUCCESS) {
code = taosCfgSetOption(options, tListLen(options), pItem, false);
diff --git a/source/dnode/mgmt/exe/dmMain.c b/source/dnode/mgmt/exe/dmMain.c
index 51476757e5..bd7da3f4d6 100644
--- a/source/dnode/mgmt/exe/dmMain.c
+++ b/source/dnode/mgmt/exe/dmMain.c
@@ -170,6 +170,8 @@ static void dmSetSignalHandle() {
#endif
}
+extern bool generateNewMeta;
+
static int32_t dmParseArgs(int32_t argc, char const *argv[]) {
global.startTime = taosGetTimestampMs();
@@ -208,6 +210,8 @@ static int32_t dmParseArgs(int32_t argc, char const *argv[]) {
global.dumpSdb = true;
} else if (strcmp(argv[i], "-dTxn") == 0) {
global.deleteTrans = true;
+ } else if (strcmp(argv[i], "-r") == 0) {
+ generateNewMeta = true;
} else if (strcmp(argv[i], "-E") == 0) {
if (i < argc - 1) {
if (strlen(argv[++i]) >= PATH_MAX) {
diff --git a/source/dnode/mgmt/mgmt_snode/inc/smInt.h b/source/dnode/mgmt/mgmt_snode/inc/smInt.h
index 9d519e88f0..0df4b1c58a 100644
--- a/source/dnode/mgmt/mgmt_snode/inc/smInt.h
+++ b/source/dnode/mgmt/mgmt_snode/inc/smInt.h
@@ -47,7 +47,7 @@ int32_t smPutMsgToQueue(SSnodeMgmt *pMgmt, EQueueType qtype, SRpcMsg *pMsg);
int32_t smPutNodeMsgToMgmtQueue(SSnodeMgmt *pMgmt, SRpcMsg *pMsg);
int32_t smPutNodeMsgToWriteQueue(SSnodeMgmt *pMgmt, SRpcMsg *pMsg);
int32_t smPutNodeMsgToStreamQueue(SSnodeMgmt *pMgmt, SRpcMsg *pMsg);
-void sndEnqueueStreamDispatch(SSnode *pSnode, SRpcMsg *pMsg);
+int32_t smPutNodeMsgToChkptQueue(SSnodeMgmt *pMgmt, SRpcMsg *pMsg);
#ifdef __cplusplus
}
diff --git a/source/dnode/mgmt/mgmt_snode/src/smHandle.c b/source/dnode/mgmt/mgmt_snode/src/smHandle.c
index 024e2e4e99..11710d7b39 100644
--- a/source/dnode/mgmt/mgmt_snode/src/smHandle.c
+++ b/source/dnode/mgmt/mgmt_snode/src/smHandle.c
@@ -102,6 +102,8 @@ SArray *smGetMsgHandles() {
if (dmSetMgmtHandle(pArray, TDMT_MND_STREAM_REQ_CHKPT_RSP, smPutNodeMsgToStreamQueue, 1) == NULL) goto _OVER;
if (dmSetMgmtHandle(pArray, TDMT_MND_STREAM_CHKPT_REPORT_RSP, smPutNodeMsgToStreamQueue, 1) == NULL) goto _OVER;
+ if (dmSetMgmtHandle(pArray, TDMT_STREAM_CHKPT_EXEC, smPutNodeMsgToStreamQueue, 0) == NULL) goto _OVER;
+
code = 0;
_OVER:
if (code != 0) {
diff --git a/source/dnode/mgmt/mgmt_snode/src/smWorker.c b/source/dnode/mgmt/mgmt_snode/src/smWorker.c
index 1e882fc656..1255542454 100644
--- a/source/dnode/mgmt/mgmt_snode/src/smWorker.c
+++ b/source/dnode/mgmt/mgmt_snode/src/smWorker.c
@@ -162,6 +162,9 @@ int32_t smPutMsgToQueue(SSnodeMgmt *pMgmt, EQueueType qtype, SRpcMsg *pRpc) {
case WRITE_QUEUE:
code = smPutNodeMsgToWriteQueue(pMgmt, pMsg);
break;
+ case STREAM_CHKPT_QUEUE:
+ code = smPutNodeMsgToStreamQueue(pMgmt, pMsg);
+ break;
default:
code = TSDB_CODE_INVALID_PARA;
rpcFreeCont(pMsg->pCont);
@@ -172,7 +175,6 @@ int32_t smPutMsgToQueue(SSnodeMgmt *pMgmt, EQueueType qtype, SRpcMsg *pRpc) {
}
int32_t smPutNodeMsgToMgmtQueue(SSnodeMgmt *pMgmt, SRpcMsg *pMsg) {
- int32_t code = 0;
SMultiWorker *pWorker = taosArrayGetP(pMgmt->writeWroker, 0);
if (pWorker == NULL) {
return TSDB_CODE_INVALID_MSG;
@@ -198,3 +200,10 @@ int32_t smPutNodeMsgToStreamQueue(SSnodeMgmt *pMgmt, SRpcMsg *pMsg) {
dTrace("msg:%p, put into worker %s", pMsg, pWorker->name);
return taosWriteQitem(pWorker->queue, pMsg);
}
+
+//int32_t smPutNodeMsgToChkptQueue(SSnodeMgmt *pMgmt, SRpcMsg *pMsg) {
+// SSingleWorker *pWorker = &pMgmt->chkptWorker;
+//
+// dTrace("msg:%p, put into worker %s", pMsg, pWorker->name);
+// return taosWriteQitem(pWorker->queue, pMsg);
+//}
diff --git a/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h b/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
index e33730130d..cb41bc0ea7 100644
--- a/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
+++ b/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
@@ -34,6 +34,7 @@ typedef struct SVnodeMgmt {
SAutoQWorkerPool streamPool;
SAutoQWorkerPool streamLongExecPool;
SWWorkerPool streamCtrlPool;
+ SWWorkerPool streamChkPool;
SWWorkerPool fetchPool;
SSingleWorker mgmtWorker;
SSingleWorker mgmtMultiWorker;
@@ -77,6 +78,7 @@ typedef struct {
STaosQueue *pStreamQ;
STaosQueue *pStreamCtrlQ;
STaosQueue *pStreamLongExecQ;
+ STaosQueue *pStreamChkQ;
STaosQueue *pFetchQ;
STaosQueue *pMultiMgmQ;
} SVnodeObj;
@@ -141,6 +143,7 @@ int32_t vmPutMsgToStreamQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg);
int32_t vmPutMsgToStreamCtrlQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg);
int32_t vmPutMsgToStreamLongExecQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg);
+int32_t vmPutMsgToStreamChkQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg);
int32_t vmPutMsgToMergeQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg);
int32_t vmPutMsgToMgmtQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg);
int32_t vmPutMsgToMultiMgmtQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg);
diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
index fc8ff3133a..8a18727b99 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
@@ -1022,6 +1022,7 @@ SArray *vmGetMsgHandles() {
if (dmSetMgmtHandle(pArray, TDMT_MND_STREAM_CHKPT_REPORT_RSP, vmPutMsgToStreamCtrlQueue, 0) == NULL) goto _OVER;
if (dmSetMgmtHandle(pArray, TDMT_VND_STREAM_SCAN_HISTORY, vmPutMsgToStreamLongExecQueue, 0) == NULL) goto _OVER;
+ if (dmSetMgmtHandle(pArray, TDMT_STREAM_CHKPT_EXEC, vmPutMsgToStreamChkQueue, 0) == NULL) goto _OVER;
if (dmSetMgmtHandle(pArray, TDMT_VND_GET_STREAM_PROGRESS, vmPutMsgToStreamQueue, 0) == NULL) goto _OVER;
if (dmSetMgmtHandle(pArray, TDMT_STREAM_RETRIEVE, vmPutMsgToStreamQueue, 0) == NULL) goto _OVER;
if (dmSetMgmtHandle(pArray, TDMT_STREAM_RETRIEVE_RSP, vmPutMsgToStreamQueue, 0) == NULL) goto _OVER;
diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
index 8871cd575f..5da3b2ce9a 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
@@ -407,6 +407,9 @@ void vmCloseVnode(SVnodeMgmt *pMgmt, SVnodeObj *pVnode, bool commitAndRemoveWal,
pVnode->pStreamLongExecQ, taosQueueItemSize(pVnode->pStreamLongExecQ));
while (!taosQueueEmpty(pVnode->pStreamLongExecQ)) taosMsleep(50);
+ dInfo("vgId:%d, wait for vnode stream chkpt queue:%p is empty", pVnode->vgId, pVnode->pStreamChkQ);
+ while (!taosQueueEmpty(pVnode->pStreamChkQ)) taosMsleep(10);
+
dInfo("vgId:%d, all vnode queues is empty", pVnode->vgId);
dInfo("vgId:%d, post close", pVnode->vgId);
diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
index 5acd06bbda..41f3c64e7d 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
@@ -165,6 +165,34 @@ static void vmProcessStreamCtrlQueue(SQueueInfo *pInfo, STaosQall* pQall, int32_
}
}
+static void vmProcessStreamChkptQueue(SQueueInfo *pInfo, STaosQall* pQall, int32_t numOfItems) {
+ SVnodeObj *pVnode = pInfo->ahandle;
+ void *pItem = NULL;
+ int32_t code = 0;
+
+ while (1) {
+ if (taosGetQitem(pQall, &pItem) == 0) {
+ break;
+ }
+
+ SRpcMsg *pMsg = pItem;
+ const STraceId *trace = &pMsg->info.traceId;
+
+ dGTrace("vgId:%d, msg:%p get from vnode-stream-chkpt queue", pVnode->vgId, pMsg);
+ code = vnodeProcessStreamChkptMsg(pVnode->pImpl, pMsg, pInfo);
+ if (code != 0) {
+ terrno = code;
+ dGError("vgId:%d, msg:%p failed to process stream chkpt msg %s since %s", pVnode->vgId, pMsg,
+ TMSG_INFO(pMsg->msgType), tstrerror(code));
+ vmSendRsp(pMsg, code);
+ }
+
+ dGTrace("vgId:%d, msg:%p is freed, code:0x%x", pVnode->vgId, pMsg, code);
+ rpcFreeCont(pMsg->pCont);
+ taosFreeQitem(pMsg);
+ }
+}
+
static void vmProcessStreamLongExecQueue(SQueueInfo *pInfo, SRpcMsg *pMsg) {
SVnodeObj *pVnode = pInfo->ahandle;
const STraceId *trace = &pMsg->info.traceId;
@@ -301,6 +329,10 @@ static int32_t vmPutMsgToQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg, EQueueType qtyp
dGTrace("vgId:%d, msg:%p put into vnode-stream-long-exec queue", pVnode->vgId, pMsg);
code = taosWriteQitem(pVnode->pStreamLongExecQ, pMsg);
break;
+ case STREAM_CHKPT_QUEUE:
+ dGTrace("vgId:%d, msg:%p put into vnode-stream-chkpt queue", pVnode->vgId, pMsg);
+ code = taosWriteQitem(pVnode->pStreamChkQ, pMsg);
+ break;
case FETCH_QUEUE:
dGTrace("vgId:%d, msg:%p put into vnode-fetch queue", pVnode->vgId, pMsg);
code = taosWriteQitem(pVnode->pFetchQ, pMsg);
@@ -361,6 +393,8 @@ int32_t vmPutMsgToStreamCtrlQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) { return vmP
int32_t vmPutMsgToStreamLongExecQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) { return vmPutMsgToQueue(pMgmt, pMsg, STREAM_LONG_EXEC_QUEUE); }
+int32_t vmPutMsgToStreamChkQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) { return vmPutMsgToQueue(pMgmt, pMsg, STREAM_CHKPT_QUEUE); }
+
int32_t vmPutMsgToMultiMgmtQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) {
const STraceId *trace = &pMsg->info.traceId;
dGTrace("msg:%p, put into vnode-multi-mgmt queue", pMsg);
@@ -439,6 +473,8 @@ int32_t vmGetQueueSize(SVnodeMgmt *pMgmt, int32_t vgId, EQueueType qtype) {
case STREAM_LONG_EXEC_QUEUE:
size = taosQueueItemSize(pVnode->pStreamLongExecQ);
break;
+ case STREAM_CHKPT_QUEUE:
+ size = taosQueueItemSize(pVnode->pStreamChkQ);
default:
break;
}
@@ -487,10 +523,11 @@ int32_t vmAllocQueue(SVnodeMgmt *pMgmt, SVnodeObj *pVnode) {
pVnode->pStreamQ = tAutoQWorkerAllocQueue(&pMgmt->streamPool, pVnode, (FItem)vmProcessStreamQueue, 2);
pVnode->pStreamCtrlQ = tWWorkerAllocQueue(&pMgmt->streamCtrlPool, pVnode, (FItems)vmProcessStreamCtrlQueue);
pVnode->pStreamLongExecQ = tAutoQWorkerAllocQueue(&pMgmt->streamLongExecPool, pVnode, (FItem)vmProcessStreamLongExecQueue, 1);
+ pVnode->pStreamChkQ = tWWorkerAllocQueue(&pMgmt->streamChkPool, pVnode, (FItems)vmProcessStreamChkptQueue);
if (pVnode->pWriteW.queue == NULL || pVnode->pSyncW.queue == NULL || pVnode->pSyncRdW.queue == NULL ||
pVnode->pApplyW.queue == NULL || pVnode->pQueryQ == NULL || pVnode->pStreamQ == NULL || pVnode->pFetchQ == NULL
- || pVnode->pStreamCtrlQ == NULL || pVnode->pStreamLongExecQ == NULL) {
+ || pVnode->pStreamCtrlQ == NULL || pVnode->pStreamLongExecQ == NULL || pVnode->pStreamChkQ == NULL) {
return TSDB_CODE_OUT_OF_MEMORY;
}
@@ -509,6 +546,8 @@ int32_t vmAllocQueue(SVnodeMgmt *pMgmt, SVnodeObj *pVnode) {
dInfo("vgId:%d, stream-long-exec-queue:%p is alloced", pVnode->vgId, pVnode->pStreamLongExecQ);
dInfo("vgId:%d, stream-ctrl-queue:%p is alloced, thread:%08" PRId64, pVnode->vgId, pVnode->pStreamCtrlQ,
taosQueueGetThreadId(pVnode->pStreamCtrlQ));
+ dInfo("vgId:%d, stream-chk-queue:%p is alloced, thread:%08" PRId64, pVnode->vgId, pVnode->pStreamChkQ,
+ taosQueueGetThreadId(pVnode->pStreamChkQ));
return 0;
}
@@ -517,6 +556,7 @@ void vmFreeQueue(SVnodeMgmt *pMgmt, SVnodeObj *pVnode) {
tAutoQWorkerFreeQueue(&pMgmt->streamPool, pVnode->pStreamQ);
tAutoQWorkerFreeQueue(&pMgmt->streamLongExecPool, pVnode->pStreamLongExecQ);
tWWorkerFreeQueue(&pMgmt->streamCtrlPool, pVnode->pStreamCtrlQ);
+ tWWorkerFreeQueue(&pMgmt->streamChkPool, pVnode->pStreamChkQ);
tWWorkerFreeQueue(&pMgmt->fetchPool, pVnode->pFetchQ);
pVnode->pQueryQ = NULL;
pVnode->pFetchQ = NULL;
@@ -525,6 +565,8 @@ void vmFreeQueue(SVnodeMgmt *pMgmt, SVnodeObj *pVnode) {
pVnode->pStreamCtrlQ = NULL;
pVnode->pStreamLongExecQ = NULL;
+ pVnode->pStreamChkQ = NULL;
+ pVnode->pFetchQ = NULL;
dDebug("vgId:%d, queue is freed", pVnode->vgId);
}
@@ -554,6 +596,11 @@ int32_t vmStartWorker(SVnodeMgmt *pMgmt) {
pStreamCtrlPool->max = 1;
if ((code = tWWorkerInit(pStreamCtrlPool)) != 0) return code;
+ SWWorkerPool *pStreamChkPool = &pMgmt->streamChkPool;
+ pStreamChkPool->name = "vnode-stream-chkpt";
+ pStreamChkPool->max = 1;
+ if ((code = tWWorkerInit(pStreamChkPool)) != 0) return code;
+
SWWorkerPool *pFPool = &pMgmt->fetchPool;
pFPool->name = "vnode-fetch";
pFPool->max = tsNumOfVnodeFetchThreads;
@@ -587,6 +634,7 @@ void vmStopWorker(SVnodeMgmt *pMgmt) {
tAutoQWorkerCleanup(&pMgmt->streamPool);
tAutoQWorkerCleanup(&pMgmt->streamLongExecPool);
tWWorkerCleanup(&pMgmt->streamCtrlPool);
+ tWWorkerCleanup(&pMgmt->streamChkPool);
tWWorkerCleanup(&pMgmt->fetchPool);
dDebug("vnode workers are closed");
}
diff --git a/source/dnode/mnode/impl/src/mndAnode.c b/source/dnode/mnode/impl/src/mndAnode.c
index c08d4aead4..bd0a4f3138 100644
--- a/source/dnode/mnode/impl/src/mndAnode.c
+++ b/source/dnode/mnode/impl/src/mndAnode.c
@@ -789,7 +789,7 @@ static int32_t mndGetAnodeAlgoList(const char *url, SAnodeObj *pObj) {
char anodeUrl[TSDB_ANALYTIC_ANODE_URL_LEN + 1] = {0};
snprintf(anodeUrl, TSDB_ANALYTIC_ANODE_URL_LEN, "%s/%s", url, "list");
- SJson *pJson = taosAnalySendReqRetJson(anodeUrl, ANALYTICS_HTTP_TYPE_GET, NULL);
+ SJson *pJson = taosAnalySendReqRetJson(anodeUrl, ANALYTICS_HTTP_TYPE_GET, NULL, 0);
if (pJson == NULL) return terrno;
int32_t code = mndDecodeAlgoList(pJson, pObj);
@@ -805,7 +805,7 @@ static int32_t mndGetAnodeStatus(SAnodeObj *pObj, char *status, int32_t statusLe
char anodeUrl[TSDB_ANALYTIC_ANODE_URL_LEN + 1] = {0};
snprintf(anodeUrl, TSDB_ANALYTIC_ANODE_URL_LEN, "%s/%s", pObj->url, "status");
- SJson *pJson = taosAnalySendReqRetJson(anodeUrl, ANALYTICS_HTTP_TYPE_GET, NULL);
+ SJson *pJson = taosAnalySendReqRetJson(anodeUrl, ANALYTICS_HTTP_TYPE_GET, NULL, 0);
if (pJson == NULL) return terrno;
code = tjsonGetDoubleValue(pJson, "protocol", &tmp);
diff --git a/source/dnode/snode/src/snode.c b/source/dnode/snode/src/snode.c
index 851bf25665..dcdc70da68 100644
--- a/source/dnode/snode/src/snode.c
+++ b/source/dnode/snode/src/snode.c
@@ -92,7 +92,7 @@ FAIL:
}
int32_t sndInit(SSnode *pSnode) {
- if (streamTaskSchedTask(&pSnode->msgCb, pSnode->pMeta->vgId, 0, 0, STREAM_EXEC_T_START_ALL_TASKS) != 0) {
+ if (streamTaskSchedTask(&pSnode->msgCb, pSnode->pMeta->vgId, 0, 0, STREAM_EXEC_T_START_ALL_TASKS, false) != 0) {
sndError("failed to start all tasks");
}
return 0;
@@ -138,6 +138,8 @@ int32_t sndProcessStreamMsg(SSnode *pSnode, SRpcMsg *pMsg) {
return tqStreamTaskProcessRetrieveTriggerReq(pSnode->pMeta, pMsg);
case TDMT_STREAM_RETRIEVE_TRIGGER_RSP:
return tqStreamTaskProcessRetrieveTriggerRsp(pSnode->pMeta, pMsg);
+ case TDMT_STREAM_CHKPT_EXEC:
+ return tqStreamTaskProcessRunReq(pSnode->pMeta, pMsg, true);
default:
sndError("invalid snode msg:%d", pMsg->msgType);
return TSDB_CODE_INVALID_MSG;
diff --git a/source/dnode/vnode/inc/vnode.h b/source/dnode/vnode/inc/vnode.h
index d224f9a411..a85dca05d5 100644
--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
@@ -114,6 +114,7 @@ int32_t vnodeProcessFetchMsg(SVnode *pVnode, SRpcMsg *pMsg, SQueueInfo *pInfo);
int32_t vnodeProcessStreamMsg(SVnode *pVnode, SRpcMsg *pMsg, SQueueInfo *pInfo);
int32_t vnodeProcessStreamCtrlMsg(SVnode *pVnode, SRpcMsg *pMsg, SQueueInfo *pInfo);
int32_t vnodeProcessStreamLongExecMsg(SVnode *pVnode, SRpcMsg *pMsg, SQueueInfo *pInfo);
+int32_t vnodeProcessStreamChkptMsg(SVnode *pVnode, SRpcMsg *pMsg, SQueueInfo *pInfo);
void vnodeProposeWriteMsg(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs);
void vnodeApplyWriteMsg(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs);
void vnodeProposeCommitOnNeed(SVnode *pVnode, bool atExit);
diff --git a/source/dnode/vnode/src/meta/metaCommit.c b/source/dnode/vnode/src/meta/metaCommit.c
index 6ed4991679..3b9857a6a2 100644
--- a/source/dnode/vnode/src/meta/metaCommit.c
+++ b/source/dnode/vnode/src/meta/metaCommit.c
@@ -14,10 +14,19 @@
*/
#include "meta.h"
+#include "vnd.h"
static FORCE_INLINE void *metaMalloc(void *pPool, size_t size) {
+ SVBufPool *pool = (SVBufPool *)pPool;
+ SVnode *pVnode = pool->pVnode;
+
+ if (pVnode->inUse && pVnode->inUse->size > pVnode->inUse->node.size) {
+ return NULL;
+ }
+
return vnodeBufPoolMallocAligned((SVBufPool *)pPool, size);
}
+
static FORCE_INLINE void metaFree(void *pPool, void *p) { vnodeBufPoolFree((SVBufPool *)pPool, p); }
// begin a meta txn
diff --git a/source/dnode/vnode/src/meta/metaOpen.c b/source/dnode/vnode/src/meta/metaOpen.c
index 15debf07f8..e0d8c66f0c 100644
--- a/source/dnode/vnode/src/meta/metaOpen.c
+++ b/source/dnode/vnode/src/meta/metaOpen.c
@@ -257,22 +257,185 @@ void vnodeGetMetaPath(SVnode *pVnode, const char *metaDir, char *fname) {
snprintf(fname + offset, TSDB_FILENAME_LEN - offset - 1, "%s%s", TD_DIRSEP, metaDir);
}
+bool generateNewMeta = false;
+
+static int32_t metaGenerateNewMeta(SMeta **ppMeta) {
+ SMeta *pNewMeta = NULL;
+ SMeta *pMeta = *ppMeta;
+ SVnode *pVnode = pMeta->pVnode;
+
+ metaInfo("vgId:%d start to generate new meta", TD_VID(pMeta->pVnode));
+
+ // Open a new meta for organization
+ int32_t code = metaOpenImpl(pMeta->pVnode, &pNewMeta, VNODE_META_TMP_DIR, false);
+ if (code) {
+ return code;
+ }
+
+ code = metaBegin(pNewMeta, META_BEGIN_HEAP_NIL);
+ if (code) {
+ return code;
+ }
+
+ // i == 0, scan super table
+ // i == 1, scan normal table and child table
+ for (int i = 0; i < 2; i++) {
+ TBC *uidCursor = NULL;
+ int32_t counter = 0;
+
+ code = tdbTbcOpen(pMeta->pUidIdx, &uidCursor, NULL);
+ if (code) {
+ metaError("vgId:%d failed to open uid index cursor, reason:%s", TD_VID(pVnode), tstrerror(code));
+ return code;
+ }
+
+ code = tdbTbcMoveToFirst(uidCursor);
+ if (code) {
+ metaError("vgId:%d failed to move to first, reason:%s", TD_VID(pVnode), tstrerror(code));
+ tdbTbcClose(uidCursor);
+ return code;
+ }
+
+ for (;;) {
+ const void *pKey;
+ int kLen;
+ const void *pVal;
+ int vLen;
+
+ if (tdbTbcGet(uidCursor, &pKey, &kLen, &pVal, &vLen) < 0) {
+ break;
+ }
+
+ tb_uid_t uid = *(tb_uid_t *)pKey;
+ SUidIdxVal *pUidIdxVal = (SUidIdxVal *)pVal;
+ if ((i == 0 && (pUidIdxVal->suid && pUidIdxVal->suid == uid)) // super table
+ || (i == 1 && (pUidIdxVal->suid == 0 || pUidIdxVal->suid != uid)) // normal table and child table
+ ) {
+ counter++;
+ if (i == 0) {
+ metaInfo("vgId:%d counter:%d new meta handle %s table uid:%" PRId64, TD_VID(pVnode), counter, "super", uid);
+ } else {
+ metaInfo("vgId:%d counter:%d new meta handle %s table uid:%" PRId64, TD_VID(pVnode), counter,
+ pUidIdxVal->suid == 0 ? "normal" : "child", uid);
+ }
+
+ // fetch table entry
+ void *value = NULL;
+ int valueSize = 0;
+ if (tdbTbGet(pMeta->pTbDb,
+ &(STbDbKey){
+ .version = pUidIdxVal->version,
+ .uid = uid,
+ },
+ sizeof(uid), &value, &valueSize) == 0) {
+ SDecoder dc = {0};
+ SMetaEntry me = {0};
+ tDecoderInit(&dc, value, valueSize);
+ if (metaDecodeEntry(&dc, &me) == 0) {
+ if (me.type == TSDB_CHILD_TABLE &&
+ tdbTbGet(pMeta->pUidIdx, &me.ctbEntry.suid, sizeof(me.ctbEntry.suid), NULL, NULL) != 0) {
+ metaError("vgId:%d failed to get super table uid:%" PRId64 " for child table uid:%" PRId64,
+ TD_VID(pVnode), me.ctbEntry.suid, uid);
+ } else if (metaHandleEntry2(pNewMeta, &me) != 0) {
+ metaError("vgId:%d failed to handle entry, uid:%" PRId64, TD_VID(pVnode), uid);
+ }
+ }
+ tDecoderClear(&dc);
+ }
+ tdbFree(value);
+ }
+
+ code = tdbTbcMoveToNext(uidCursor);
+ if (code) {
+ metaError("vgId:%d failed to move to next, reason:%s", TD_VID(pVnode), tstrerror(code));
+ return code;
+ }
+ }
+
+ tdbTbcClose(uidCursor);
+ }
+
+ code = metaCommit(pNewMeta, pNewMeta->txn);
+ if (code) {
+ metaError("vgId:%d failed to commit, reason:%s", TD_VID(pVnode), tstrerror(code));
+ return code;
+ }
+
+ code = metaFinishCommit(pNewMeta, pNewMeta->txn);
+ if (code) {
+ metaError("vgId:%d failed to finish commit, reason:%s", TD_VID(pVnode), tstrerror(code));
+ return code;
+ }
+
+ if ((code = metaBegin(pNewMeta, META_BEGIN_HEAP_NIL)) != 0) {
+ metaError("vgId:%d failed to begin new meta, reason:%s", TD_VID(pVnode), tstrerror(code));
+ }
+ metaClose(&pNewMeta);
+ metaInfo("vgId:%d finish to generate new meta", TD_VID(pVnode));
+
+ // Commit the new metadata
+ char metaDir[TSDB_FILENAME_LEN] = {0};
+ char metaTempDir[TSDB_FILENAME_LEN] = {0};
+ char metaBackupDir[TSDB_FILENAME_LEN] = {0};
+
+ vnodeGetMetaPath(pVnode, metaDir, VNODE_META_DIR);
+ vnodeGetMetaPath(pVnode, metaTempDir, VNODE_META_TMP_DIR);
+ vnodeGetMetaPath(pVnode, metaBackupDir, VNODE_META_BACKUP_DIR);
+
+ metaClose(ppMeta);
+ if (taosRenameFile(metaDir, metaBackupDir) != 0) {
+ metaError("vgId:%d failed to rename old meta to backup, reason:%s", TD_VID(pVnode), tstrerror(terrno));
+ return terrno;
+ }
+
+ // rename the new meta to old meta
+ if (taosRenameFile(metaTempDir, metaDir) != 0) {
+ metaError("vgId:%d failed to rename new meta to old meta, reason:%s", TD_VID(pVnode), tstrerror(terrno));
+ return terrno;
+ }
+
+ code = metaOpenImpl(pVnode, ppMeta, VNODE_META_DIR, false);
+ if (code) {
+ metaError("vgId:%d failed to open new meta, reason:%s", TD_VID(pVnode), tstrerror(code));
+ return code;
+ }
+
+ metaInfo("vgId:%d successfully opened new meta", TD_VID(pVnode));
+
+ return 0;
+}
+
int32_t metaOpen(SVnode *pVnode, SMeta **ppMeta, int8_t rollback) {
int32_t code = TSDB_CODE_SUCCESS;
char metaDir[TSDB_FILENAME_LEN] = {0};
+ char metaBackupDir[TSDB_FILENAME_LEN] = {0};
char metaTempDir[TSDB_FILENAME_LEN] = {0};
vnodeGetMetaPath(pVnode, VNODE_META_DIR, metaDir);
+ vnodeGetMetaPath(pVnode, VNODE_META_BACKUP_DIR, metaBackupDir);
vnodeGetMetaPath(pVnode, VNODE_META_TMP_DIR, metaTempDir);
- // Check file states
- if (!taosCheckExistFile(metaDir) && taosCheckExistFile(metaTempDir)) {
+ bool metaExists = taosCheckExistFile(metaDir);
+ bool metaBackupExists = taosCheckExistFile(metaBackupDir);
+ bool metaTempExists = taosCheckExistFile(metaTempDir);
+
+ if ((!metaBackupExists && !metaExists && metaTempExists) //
+ || (metaBackupExists && !metaExists && !metaTempExists) //
+ || (metaBackupExists && metaExists && metaTempExists) //
+ ) {
+ metaError("vgId:%d, invalid meta state, please check!", TD_VID(pVnode));
+ return TSDB_CODE_FAILED;
+ } else if (!metaBackupExists && metaExists && metaTempExists) {
+ taosRemoveDir(metaTempDir);
+ } else if (metaBackupExists && !metaExists && metaTempExists) {
code = taosRenameFile(metaTempDir, metaDir);
if (code) {
- metaError("vgId:%d, %s failed at %s:%d since %s: rename %s to %s failed", TD_VID(pVnode), __func__, __FILE__,
- __LINE__, tstrerror(code), metaTempDir, metaDir);
+ metaError("vgId:%d, %s failed at %s:%d since %s", TD_VID(pVnode), __func__, __FILE__, __LINE__, tstrerror(code));
return code;
}
+ taosRemoveDir(metaBackupDir);
+ } else if (metaBackupExists && metaExists && !metaTempExists) {
+ taosRemoveDir(metaBackupDir);
}
// Do open meta
@@ -282,6 +445,14 @@ int32_t metaOpen(SVnode *pVnode, SMeta **ppMeta, int8_t rollback) {
return code;
}
+ if (generateNewMeta) {
+ code = metaGenerateNewMeta(ppMeta);
+ if (code) {
+ metaError("vgId:%d, %s failed at %s:%d since %s", TD_VID(pVnode), __func__, __FILE__, __LINE__, tstrerror(code));
+ return code;
+ }
+ }
+
return TSDB_CODE_SUCCESS;
}
diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index 7d65673226..c80edd070d 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -928,12 +928,6 @@ static void doStartFillhistoryStep2(SStreamTask* pTask, SStreamTask* pStreamTask
// now the fill-history task starts to scan data from wal files.
code = streamTaskHandleEvent(pTask->status.pSM, TASK_EVENT_SCANHIST_DONE);
-// if (code == TSDB_CODE_SUCCESS) {
-// code = tqScanWalAsync(pTq, false);
-// if (code) {
-// tqError("vgId:%d failed to start scan wal file, code:%s", vgId, tstrerror(code));
-// }
-// }
}
}
diff --git a/source/dnode/vnode/src/tq/tqStreamTask.c b/source/dnode/vnode/src/tq/tqStreamTask.c
index 08ca02e20e..6a6b3574db 100644
--- a/source/dnode/vnode/src/tq/tqStreamTask.c
+++ b/source/dnode/vnode/src/tq/tqStreamTask.c
@@ -148,6 +148,7 @@ static void doStartScanWal(void* param, void* tmrId) {
return;
}
+ // failed to lock, try 500ms later
code = streamMetaTryRlock(pMeta);
if (code == 0) {
numOfTasks = taosArrayGetSize(pMeta->pTaskList);
@@ -156,25 +157,23 @@ static void doStartScanWal(void* param, void* tmrId) {
numOfTasks = 0;
}
- if (numOfTasks == 0) {
- goto _end;
- }
+ if (numOfTasks > 0) {
+ tqDebug("vgId:%d create msg to start wal scan, numOfTasks:%d", vgId, numOfTasks);
- tqDebug("vgId:%d create msg to start wal scan, numOfTasks:%d", vgId, numOfTasks);
-
- #if 0
+#if 0
// wait for the vnode is freed, and invalid read may occur.
taosMsleep(10000);
- #endif
+#endif
- code = streamTaskSchedTask(&pParam->msgCb, vgId, 0, 0, STREAM_EXEC_T_EXTRACT_WAL_DATA);
- if (code) {
- tqError("vgId:%d failed sched task to scan wal, code:%s", vgId, tstrerror(code));
+ code = streamTaskSchedTask(&pParam->msgCb, vgId, 0, 0, STREAM_EXEC_T_EXTRACT_WAL_DATA, false);
+ if (code) {
+ tqError("vgId:%d failed sched task to scan wal, code:%s", vgId, tstrerror(code));
+ }
}
_end:
streamTmrStart(doStartScanWal, SCAN_WAL_IDLE_DURATION, pParam, pTimer, &pMeta->scanInfo.scanTimer, vgId, "scan-wal");
- tqDebug("vgId:%d scan-wal will start in %dms", vgId, SCAN_WAL_IDLE_DURATION*SCAN_WAL_WAIT_COUNT);
+ tqDebug("vgId:%d try scan-wal will start in %dms", vgId, SCAN_WAL_IDLE_DURATION*SCAN_WAL_WAIT_COUNT);
code = taosReleaseRef(streamMetaRefPool, pParam->metaId);
if (code) {
@@ -192,7 +191,7 @@ void tqScanWalAsync(STQ* pTq) {
// 1. the vnode should be the leader.
// 2. the stream isn't disabled
- if ((pMeta->role == NODE_ROLE_FOLLOWER) || tsDisableStream) {
+ if ((pMeta->role != NODE_ROLE_LEADER) || tsDisableStream) {
tqInfo("vgId:%d follower node or stream disabled, not scan wal", vgId);
return;
}
@@ -217,7 +216,7 @@ void tqScanWalAsync(STQ* pTq) {
}
int32_t tqStopStreamAllTasksAsync(SStreamMeta* pMeta, SMsgCb* pMsgCb) {
- return streamTaskSchedTask(pMsgCb, pMeta->vgId, 0, 0, STREAM_EXEC_T_STOP_ALL_TASKS);
+ return streamTaskSchedTask(pMsgCb, pMeta->vgId, 0, 0, STREAM_EXEC_T_STOP_ALL_TASKS, false);
}
int32_t setWalReaderStartOffset(SStreamTask* pTask, int32_t vgId) {
@@ -323,7 +322,7 @@ bool taskReadyForDataFromWal(SStreamTask* pTask) {
// check whether input queue is full or not
if (streamQueueIsFull(pTask->inputq.queue)) {
tqTrace("s-task:%s input queue is full, launch task without scanning wal", pTask->id.idStr);
- int32_t code = streamTrySchedExec(pTask);
+ int32_t code = streamTrySchedExec(pTask, false);
if (code) {
tqError("s-task:%s failed to start task while inputQ is full", pTask->id.idStr);
}
@@ -462,7 +461,7 @@ int32_t doScanWalForAllTasks(SStreamMeta* pStreamMeta, int32_t* pNumOfTasks) {
streamMutexUnlock(&pTask->lock);
if ((numOfItems > 0) || hasNewData) {
- code = streamTrySchedExec(pTask);
+ code = streamTrySchedExec(pTask, false);
if (code != TSDB_CODE_SUCCESS) {
streamMetaReleaseTask(pStreamMeta, pTask);
taosArrayDestroy(pTaskList);
diff --git a/source/dnode/vnode/src/tqCommon/tqCommon.c b/source/dnode/vnode/src/tqCommon/tqCommon.c
index 1afccd3d01..64072bbda1 100644
--- a/source/dnode/vnode/src/tqCommon/tqCommon.c
+++ b/source/dnode/vnode/src/tqCommon/tqCommon.c
@@ -131,7 +131,7 @@ int32_t tqStreamTaskStartAsync(SStreamMeta* pMeta, SMsgCb* cb, bool restart) {
tqDebug("vgId:%d start all %d stream task(s) async", vgId, numOfTasks);
int32_t type = restart ? STREAM_EXEC_T_RESTART_ALL_TASKS : STREAM_EXEC_T_START_ALL_TASKS;
- return streamTaskSchedTask(cb, vgId, 0, 0, type);
+ return streamTaskSchedTask(cb, vgId, 0, 0, type, false);
}
int32_t tqStreamStartOneTaskAsync(SStreamMeta* pMeta, SMsgCb* cb, int64_t streamId, int32_t taskId) {
@@ -143,7 +143,7 @@ int32_t tqStreamStartOneTaskAsync(SStreamMeta* pMeta, SMsgCb* cb, int64_t stream
}
tqDebug("vgId:%d start task:0x%x async", vgId, taskId);
- return streamTaskSchedTask(cb, vgId, streamId, taskId, STREAM_EXEC_T_START_ONE_TASK);
+ return streamTaskSchedTask(cb, vgId, streamId, taskId, STREAM_EXEC_T_START_ONE_TASK, false);
}
// this is to process request from transaction, always return true.
@@ -960,11 +960,6 @@ int32_t tqStartTaskCompleteCallback(SStreamMeta* pMeta) {
streamMetaWUnLock(pMeta);
-// if (scanWal && (vgId != SNODE_HANDLE)) {
-// tqDebug("vgId:%d start scan wal for executing tasks", vgId);
-// code = tqScanWalAsync(pMeta->ahandle, true);
-// }
-
return code;
}
@@ -1227,7 +1222,7 @@ static int32_t tqProcessTaskResumeImpl(void* handle, SStreamTask* pTask, int64_t
} else if (level == TASK_LEVEL__SOURCE && (streamQueueGetNumOfItems(pTask->inputq.queue) == 0)) {
// code = tqScanWalAsync((STQ*)handle, false);
} else {
- code = streamTrySchedExec(pTask);
+ code = streamTrySchedExec(pTask, false);
}
}
diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c
index 8baf08ef94..ca3b82239b 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c
@@ -610,11 +610,12 @@ static int32_t tsdbTryAcquireReader(STsdbReader* pReader) {
code = taosThreadMutexTryLock(&pReader->readerMutex);
if (code != TSDB_CODE_SUCCESS) {
- tsdbError("tsdb/read: %p, post-trytake read mutex: %p, code: %d", pReader, &pReader->readerMutex, code);
+ // Failing to acquire the lock is reasonable, not an error
+ tsdbWarn("tsdb/read: %p, post-trytake read mutex: %p, code: %d", pReader, &pReader->readerMutex, code);
} else {
tsdbTrace("tsdb/read: %p, post-trytask read mutex: %p", pReader, &pReader->readerMutex);
}
- TSDB_CHECK_CODE(code, lino, _end);
+ return code;
_end:
if (code != TSDB_CODE_SUCCESS) {
diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c
index 22d9c2657d..ea4ca896ab 100644
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@@ -940,6 +940,8 @@ int32_t vnodeProcessFetchMsg(SVnode *pVnode, SRpcMsg *pMsg, SQueueInfo *pInfo) {
int32_t vnodeProcessStreamMsg(SVnode *pVnode, SRpcMsg *pMsg, SQueueInfo *pInfo) {
vTrace("vgId:%d, msg:%p in stream queue is processing", pVnode->config.vgId, pMsg);
+
+ // todo: NOTE: some command needs to run on follower, such as, stop_all_tasks
if ((pMsg->msgType == TDMT_SCH_FETCH || pMsg->msgType == TDMT_VND_TABLE_META || pMsg->msgType == TDMT_VND_TABLE_CFG ||
pMsg->msgType == TDMT_VND_BATCH_META) &&
!syncIsReadyForRead(pVnode->sync)) {
@@ -1016,6 +1018,24 @@ int32_t vnodeProcessStreamLongExecMsg(SVnode *pVnode, SRpcMsg *pMsg, SQueueInfo
}
}
+int32_t vnodeProcessStreamChkptMsg(SVnode *pVnode, SRpcMsg *pMsg, SQueueInfo *pInfo) {
+ vTrace("vgId:%d, msg:%p in stream chkpt queue is processing", pVnode->config.vgId, pMsg);
+ if ((pMsg->msgType == TDMT_SCH_FETCH || pMsg->msgType == TDMT_VND_TABLE_META || pMsg->msgType == TDMT_VND_TABLE_CFG ||
+ pMsg->msgType == TDMT_VND_BATCH_META) &&
+ !syncIsReadyForRead(pVnode->sync)) {
+ vnodeRedirectRpcMsg(pVnode, pMsg, terrno);
+ return 0;
+ }
+
+ switch (pMsg->msgType) {
+ case TDMT_STREAM_CHKPT_EXEC:
+ return tqProcessTaskRunReq(pVnode->pTq, pMsg);
+ default:
+ vError("unknown msg type:%d in stream chkpt queue", pMsg->msgType);
+ return TSDB_CODE_APP_ERROR;
+ }
+}
+
void smaHandleRes(void *pVnode, int64_t smaId, const SArray *data) {
int32_t code = tdProcessTSmaInsert(((SVnode *)pVnode)->pSma, smaId, (const char *)data);
if (code) {
diff --git a/source/dnode/vnode/src/vnd/vnodeSync.c b/source/dnode/vnode/src/vnd/vnodeSync.c
index 2a06686a31..317fd3307e 100644
--- a/source/dnode/vnode/src/vnd/vnodeSync.c
+++ b/source/dnode/vnode/src/vnd/vnodeSync.c
@@ -597,7 +597,7 @@ static void vnodeRestoreFinish(const SSyncFSM *pFsm, const SyncIndex commitIdx)
streamMetaWUnLock(pMeta);
tqInfo("vgId:%d stream task already loaded, start them", vgId);
- int32_t code = streamTaskSchedTask(&pVnode->msgCb, TD_VID(pVnode), 0, 0, STREAM_EXEC_T_START_ALL_TASKS);
+ int32_t code = streamTaskSchedTask(&pVnode->msgCb, TD_VID(pVnode), 0, 0, STREAM_EXEC_T_START_ALL_TASKS, false);
if (code != 0) {
tqError("vgId:%d failed to sched stream task, code:%s", vgId, tstrerror(code));
}
diff --git a/source/libs/executor/src/anomalywindowoperator.c b/source/libs/executor/src/anomalywindowoperator.c
index 46aae38ad4..379177bb06 100644
--- a/source/libs/executor/src/anomalywindowoperator.c
+++ b/source/libs/executor/src/anomalywindowoperator.c
@@ -47,6 +47,7 @@ typedef struct {
char algoName[TSDB_ANALYTIC_ALGO_NAME_LEN];
char algoUrl[TSDB_ANALYTIC_ALGO_URL_LEN];
char anomalyOpt[TSDB_ANALYTIC_ALGO_OPTION_LEN];
+ int64_t timeout;
SAnomalyWindowSupp anomalySup;
SWindowRowsSup anomalyWinRowSup;
SColumn anomalyCol;
@@ -89,6 +90,20 @@ int32_t createAnomalywindowOperatorInfo(SOperatorInfo* downstream, SPhysiNode* p
goto _error;
}
+ bool hasTimeout = taosAnalyGetOptInt(pAnomalyNode->anomalyOpt, "timeout", &pInfo->timeout);
+ if (!hasTimeout) {
+ qDebug("not set the timeout val, set default:%d", ANALY_DEFAULT_TIMEOUT);
+ pInfo->timeout = ANALY_DEFAULT_TIMEOUT;
+ } else {
+ if (pInfo->timeout <= 0 || pInfo->timeout > ANALY_MAX_TIMEOUT) {
+ qDebug("timeout val:%" PRId64 "s is invalid (greater than 10min or less than 1s), use default:%dms",
+ pInfo->timeout, ANALY_DEFAULT_TIMEOUT);
+ pInfo->timeout = ANALY_DEFAULT_TIMEOUT;
+ } else {
+ qDebug("timeout val is set to: %" PRId64 "s", pInfo->timeout);
+ }
+ }
+
pOperator->exprSupp.hasWindowOrGroup = true;
pInfo->tsSlotId = ((SColumnNode*)pAnomalyNode->window.pTspk)->slotId;
tstrncpy(pInfo->anomalyOpt, pAnomalyNode->anomalyOpt, sizeof(pInfo->anomalyOpt));
@@ -451,7 +466,7 @@ static int32_t anomalyAnalysisWindow(SOperatorInfo* pOperator) {
code = taosAnalyBufClose(&analyBuf);
QUERY_CHECK_CODE(code, lino, _OVER);
- pJson = taosAnalySendReqRetJson(pInfo->algoUrl, ANALYTICS_HTTP_TYPE_POST, &analyBuf);
+ pJson = taosAnalySendReqRetJson(pInfo->algoUrl, ANALYTICS_HTTP_TYPE_POST, &analyBuf, pInfo->timeout * 1000);
if (pJson == NULL) {
code = terrno;
goto _OVER;
diff --git a/source/libs/executor/src/forecastoperator.c b/source/libs/executor/src/forecastoperator.c
index e318530352..e9185824a3 100644
--- a/source/libs/executor/src/forecastoperator.c
+++ b/source/libs/executor/src/forecastoperator.c
@@ -38,6 +38,7 @@ typedef struct {
int64_t optRows;
int64_t cachedRows;
int32_t numOfBlocks;
+ int64_t timeout;
int16_t resTsSlot;
int16_t resValSlot;
int16_t resLowSlot;
@@ -76,10 +77,10 @@ static int32_t forecastCacheBlock(SForecastSupp* pSupp, SSDataBlock* pBlock, con
int32_t lino = 0;
SAnalyticBuf* pBuf = &pSupp->analyBuf;
- if (pSupp->cachedRows > ANALY_FORECAST_MAX_HISTORY_ROWS) {
+ if (pSupp->cachedRows > ANALY_FORECAST_MAX_ROWS) {
code = TSDB_CODE_ANA_ANODE_TOO_MANY_ROWS;
qError("%s rows:%" PRId64 " for forecast cache, error happens, code:%s, upper limit:%d", id, pSupp->cachedRows,
- tstrerror(code), ANALY_FORECAST_MAX_HISTORY_ROWS);
+ tstrerror(code), ANALY_FORECAST_MAX_ROWS);
return code;
}
@@ -157,8 +158,8 @@ static int32_t forecastCloseBuf(SForecastSupp* pSupp, const char* id) {
qDebug("%s forecast rows not found from %s, use default:%" PRId64, id, pSupp->algoOpt, pSupp->optRows);
}
- if (pSupp->optRows > ANALY_MAX_FC_ROWS) {
- qError("%s required too many forecast rows, max allowed:%d, required:%" PRId64, id, ANALY_MAX_FC_ROWS,
+ if (pSupp->optRows > ANALY_FORECAST_MAX_ROWS) {
+ qError("%s required too many forecast rows, max allowed:%d, required:%" PRId64, id, ANALY_FORECAST_MAX_ROWS,
pSupp->optRows);
return TSDB_CODE_ANA_ANODE_TOO_MANY_ROWS;
}
@@ -198,12 +199,12 @@ static int32_t forecastCloseBuf(SForecastSupp* pSupp, const char* id) {
static int32_t forecastAnalysis(SForecastSupp* pSupp, SSDataBlock* pBlock, const char* pId) {
SAnalyticBuf* pBuf = &pSupp->analyBuf;
int32_t resCurRow = pBlock->info.rows;
- int8_t tmpI8;
- int16_t tmpI16;
- int32_t tmpI32;
- int64_t tmpI64;
- float tmpFloat;
- double tmpDouble;
+ int8_t tmpI8 = 0;
+ int16_t tmpI16 = 0;
+ int32_t tmpI32 = 0;
+ int64_t tmpI64 = 0;
+ float tmpFloat = 0;
+ double tmpDouble = 0;
int32_t code = 0;
SColumnInfoData* pResValCol = taosArrayGet(pBlock->pDataBlock, pSupp->resValSlot);
@@ -211,12 +212,13 @@ static int32_t forecastAnalysis(SForecastSupp* pSupp, SSDataBlock* pBlock, const
return terrno;
}
- SColumnInfoData* pResTsCol = (pSupp->resTsSlot != -1 ? taosArrayGet(pBlock->pDataBlock, pSupp->resTsSlot) : NULL);
- SColumnInfoData* pResLowCol = (pSupp->resLowSlot != -1 ? taosArrayGet(pBlock->pDataBlock, pSupp->resLowSlot) : NULL);
+ SColumnInfoData* pResTsCol = ((pSupp->resTsSlot != -1) ? taosArrayGet(pBlock->pDataBlock, pSupp->resTsSlot) : NULL);
+ SColumnInfoData* pResLowCol =
+ ((pSupp->resLowSlot != -1) ? taosArrayGet(pBlock->pDataBlock, pSupp->resLowSlot) : NULL);
SColumnInfoData* pResHighCol =
(pSupp->resHighSlot != -1 ? taosArrayGet(pBlock->pDataBlock, pSupp->resHighSlot) : NULL);
- SJson* pJson = taosAnalySendReqRetJson(pSupp->algoUrl, ANALYTICS_HTTP_TYPE_POST, pBuf);
+ SJson* pJson = taosAnalySendReqRetJson(pSupp->algoUrl, ANALYTICS_HTTP_TYPE_POST, pBuf, pSupp->timeout * 1000);
if (pJson == NULL) {
return terrno;
}
@@ -527,18 +529,32 @@ static int32_t forecastParseInput(SForecastSupp* pSupp, SNodeList* pFuncs) {
return 0;
}
-static int32_t forecastParseAlgo(SForecastSupp* pSupp) {
+static int32_t forecastParseAlgo(SForecastSupp* pSupp, const char* id) {
pSupp->maxTs = 0;
pSupp->minTs = INT64_MAX;
pSupp->numOfRows = 0;
if (!taosAnalyGetOptStr(pSupp->algoOpt, "algo", pSupp->algoName, sizeof(pSupp->algoName))) {
- qError("failed to get forecast algorithm name from %s", pSupp->algoOpt);
+ qError("%s failed to get forecast algorithm name from %s", id, pSupp->algoOpt);
return TSDB_CODE_ANA_ALGO_NOT_FOUND;
}
+ bool hasTimeout = taosAnalyGetOptInt(pSupp->algoOpt, "timeout", &pSupp->timeout);
+ if (!hasTimeout) {
+ qDebug("%s not set the timeout val, set default:%d", id, ANALY_DEFAULT_TIMEOUT);
+ pSupp->timeout = ANALY_DEFAULT_TIMEOUT;
+ } else {
+ if (pSupp->timeout <= 0 || pSupp->timeout > ANALY_MAX_TIMEOUT) {
+ qDebug("%s timeout val:%" PRId64 "s is invalid (greater than 10min or less than 1s), use default:%dms",
+ id, pSupp->timeout, ANALY_DEFAULT_TIMEOUT);
+ pSupp->timeout = ANALY_DEFAULT_TIMEOUT;
+ } else {
+ qDebug("%s timeout val is set to: %" PRId64 "s", id, pSupp->timeout);
+ }
+ }
+
if (taosAnalyGetAlgoUrl(pSupp->algoName, ANALY_ALGO_TYPE_FORECAST, pSupp->algoUrl, sizeof(pSupp->algoUrl)) != 0) {
- qError("failed to get forecast algorithm url from %s", pSupp->algoName);
+ qError("%s failed to get forecast algorithm url from %s", id, pSupp->algoName);
return TSDB_CODE_ANA_ALGO_NOT_LOAD;
}
@@ -589,6 +605,7 @@ int32_t createForecastOperatorInfo(SOperatorInfo* downstream, SPhysiNode* pPhyNo
goto _error;
}
+ const char* pId = pTaskInfo->id.str;
SForecastSupp* pSupp = &pInfo->forecastSupp;
SForecastFuncPhysiNode* pForecastPhyNode = (SForecastFuncPhysiNode*)pPhyNode;
SExprSupp* pExprSup = &pOperator->exprSupp;
@@ -620,7 +637,7 @@ int32_t createForecastOperatorInfo(SOperatorInfo* downstream, SPhysiNode* pPhyNo
code = forecastParseOutput(pSupp, pExprSup);
QUERY_CHECK_CODE(code, lino, _error);
- code = forecastParseAlgo(pSupp);
+ code = forecastParseAlgo(pSupp, pId);
QUERY_CHECK_CODE(code, lino, _error);
code = forecastCreateBuf(pSupp);
@@ -644,7 +661,7 @@ int32_t createForecastOperatorInfo(SOperatorInfo* downstream, SPhysiNode* pPhyNo
*pOptrInfo = pOperator;
- qDebug("forecast env is initialized, option:%s", pSupp->algoOpt);
+ qDebug("%s forecast env is initialized, option:%s", pId, pSupp->algoOpt);
return TSDB_CODE_SUCCESS;
_error:
diff --git a/source/libs/executor/src/streamcountwindowoperator.c b/source/libs/executor/src/streamcountwindowoperator.c
index 63ff2fa92b..fb4a350950 100644
--- a/source/libs/executor/src/streamcountwindowoperator.c
+++ b/source/libs/executor/src/streamcountwindowoperator.c
@@ -57,11 +57,11 @@ void destroyStreamCountAggOperatorInfo(void* param) {
}
destroyStreamBasicInfo(&pInfo->basic);
- destroyStreamAggSupporter(&pInfo->streamAggSup);
cleanupExprSupp(&pInfo->scalarSupp);
clearGroupResInfo(&pInfo->groupResInfo);
taosArrayDestroyP(pInfo->pUpdated, destroyFlusedPos);
pInfo->pUpdated = NULL;
+ destroyStreamAggSupporter(&pInfo->streamAggSup);
colDataDestroy(&pInfo->twAggSup.timeWindowData);
blockDataDestroy(pInfo->pDelRes);
diff --git a/source/libs/executor/src/streameventwindowoperator.c b/source/libs/executor/src/streameventwindowoperator.c
index eacb2fcfc8..9b9b67879f 100644
--- a/source/libs/executor/src/streameventwindowoperator.c
+++ b/source/libs/executor/src/streameventwindowoperator.c
@@ -56,10 +56,10 @@ void destroyStreamEventOperatorInfo(void* param) {
}
destroyStreamBasicInfo(&pInfo->basic);
- destroyStreamAggSupporter(&pInfo->streamAggSup);
clearGroupResInfo(&pInfo->groupResInfo);
taosArrayDestroyP(pInfo->pUpdated, destroyFlusedPos);
pInfo->pUpdated = NULL;
+ destroyStreamAggSupporter(&pInfo->streamAggSup);
cleanupExprSupp(&pInfo->scalarSupp);
if (pInfo->pChildren != NULL) {
diff --git a/source/libs/executor/src/streamtimesliceoperator.c b/source/libs/executor/src/streamtimesliceoperator.c
index 681e07f452..f511c5ab4f 100644
--- a/source/libs/executor/src/streamtimesliceoperator.c
+++ b/source/libs/executor/src/streamtimesliceoperator.c
@@ -151,7 +151,7 @@ void destroyStreamTimeSliceOperatorInfo(void* param) {
pInfo->pOperator = NULL;
}
colDataDestroy(&pInfo->twAggSup.timeWindowData);
- destroyStreamAggSupporter(&pInfo->streamAggSup);
+
resetPrevAndNextWindow(pInfo->pFillSup);
destroyStreamFillSupporter(pInfo->pFillSup);
destroyStreamFillInfo(pInfo->pFillInfo);
@@ -179,6 +179,7 @@ void destroyStreamTimeSliceOperatorInfo(void* param) {
taosArrayDestroy(pInfo->historyWins);
taosArrayDestroy(pInfo->pCloseTs);
+ destroyStreamAggSupporter(&pInfo->streamAggSup);
taosMemoryFreeClear(param);
}
diff --git a/source/libs/executor/src/streamtimewindowoperator.c b/source/libs/executor/src/streamtimewindowoperator.c
index 33efd0cfb1..5c2bac0bd2 100644
--- a/source/libs/executor/src/streamtimewindowoperator.c
+++ b/source/libs/executor/src/streamtimewindowoperator.c
@@ -462,7 +462,7 @@ _end:
void destroyFlusedPos(void* pRes) {
SRowBuffPos* pPos = (SRowBuffPos*)pRes;
- if (!pPos->needFree && !pPos->pRowBuff) {
+ if (pPos->needFree && !pPos->pRowBuff) {
taosMemoryFreeClear(pPos->pKey);
taosMemoryFree(pPos);
}
@@ -475,9 +475,11 @@ void destroyFlusedppPos(void* ppRes) {
void clearGroupResInfo(SGroupResInfo* pGroupResInfo) {
int32_t size = taosArrayGetSize(pGroupResInfo->pRows);
- for (int32_t i = pGroupResInfo->index; i < size; i++) {
- void* pPos = taosArrayGetP(pGroupResInfo->pRows, i);
- destroyFlusedPos(pPos);
+ if (pGroupResInfo->index >= 0 && pGroupResInfo->index < size) {
+ for (int32_t i = pGroupResInfo->index; i < size; i++) {
+ void* pPos = taosArrayGetP(pGroupResInfo->pRows, i);
+ destroyFlusedPos(pPos);
+ }
}
pGroupResInfo->freeItem = false;
taosArrayDestroy(pGroupResInfo->pRows);
@@ -2204,11 +2206,11 @@ void destroyStreamSessionAggOperatorInfo(void* param) {
}
destroyStreamBasicInfo(&pInfo->basic);
- destroyStreamAggSupporter(&pInfo->streamAggSup);
cleanupExprSupp(&pInfo->scalarSupp);
clearGroupResInfo(&pInfo->groupResInfo);
taosArrayDestroyP(pInfo->pUpdated, destroyFlusedPos);
pInfo->pUpdated = NULL;
+ destroyStreamAggSupporter(&pInfo->streamAggSup);
if (pInfo->pChildren != NULL) {
int32_t size = taosArrayGetSize(pInfo->pChildren);
@@ -4442,10 +4444,10 @@ void destroyStreamStateOperatorInfo(void* param) {
}
destroyStreamBasicInfo(&pInfo->basic);
- destroyStreamAggSupporter(&pInfo->streamAggSup);
clearGroupResInfo(&pInfo->groupResInfo);
taosArrayDestroyP(pInfo->pUpdated, destroyFlusedPos);
pInfo->pUpdated = NULL;
+ destroyStreamAggSupporter(&pInfo->streamAggSup);
cleanupExprSupp(&pInfo->scalarSupp);
if (pInfo->pChildren != NULL) {
diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c
index be3f0d362b..8233b2d450 100644
--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
@@ -22,6 +22,9 @@
#include "tanalytics.h"
#include "taoserror.h"
#include "ttime.h"
+#include "functionMgt.h"
+#include "ttypes.h"
+#include "tglobal.h"
static int32_t buildFuncErrMsg(char* pErrBuf, int32_t len, int32_t errCode, const char* pFormat, ...) {
va_list vArgList;
@@ -1745,6 +1748,62 @@ static int32_t translateHistogramPartial(SFunctionNode* pFunc, char* pErrBuf, in
return TSDB_CODE_SUCCESS;
}
+#define NUMERIC_TO_STRINGS_LEN 25
+static int32_t translateGreatestleast(SFunctionNode* pFunc, char* pErrBuf, int32_t len) {
+ FUNC_ERR_RET(validateParam(pFunc, pErrBuf, len));
+
+ bool mixTypeToStrings = tsCompareAsStrInGreatest;
+
+ SDataType res = {.type = 0};
+ bool resInit = false;
+ for (int32_t i = 0; i < LIST_LENGTH(pFunc->pParameterList); i++) {
+ SDataType* para = getSDataTypeFromNode(nodesListGetNode(pFunc->pParameterList, i));
+
+ if (IS_NULL_TYPE(para->type)) {
+ res.type = TSDB_DATA_TYPE_NULL;
+ res.bytes = tDataTypes[TSDB_DATA_TYPE_NULL].bytes;
+ break;
+ }
+
+ if (!resInit) {
+ res.type = para->type;
+ res.bytes = para->bytes;
+ resInit = true;
+ continue;
+ }
+
+ if (IS_MATHABLE_TYPE(para->type)) {
+ if (res.type == para->type) {
+ continue;
+ } else if (IS_MATHABLE_TYPE(res.type) || !mixTypeToStrings) {
+ int32_t resType = vectorGetConvertType(res.type, para->type);
+ res.type = resType == 0 ? res.type : resType;
+ res.bytes = tDataTypes[res.type].bytes;
+ } else {
+ // last res is strings, para is numeric and mixTypeToStrings is true
+ res.bytes = TMAX(res.bytes, NUMERIC_TO_STRINGS_LEN);
+ }
+ } else {
+ if (IS_COMPARE_STR_DATA_TYPE(res.type)) {
+ int32_t resType = vectorGetConvertType(res.type, para->type);
+ res.type = resType == 0 ? res.type : resType;
+ res.bytes = TMAX(res.bytes, para->bytes);
+ } else if (mixTypeToStrings) {
+ // last res is numeric, para is string, and mixTypeToStrings is true
+ res.type = para->type;
+ res.bytes = TMAX(para->bytes, NUMERIC_TO_STRINGS_LEN);
+ } else {
+ // last res is numeric, para is string, and mixTypeToStrings is false
+ int32_t resType = vectorGetConvertType(res.type, para->type);
+ res.type = resType == 0 ? res.type : resType;
+ res.bytes = tDataTypes[resType].bytes;
+ }
+ }
+ }
+ pFunc->node.resType = res;
+ return TSDB_CODE_SUCCESS;
+}
+
// clang-format off
const SBuiltinFuncDefinition funcMgtBuiltins[] = {
{
@@ -5656,6 +5715,48 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
.name = "cols",
.translateFunc = invalidColsFunction,
},
+ {
+ .name = "greatest",
+ .type = FUNCTION_TYPE_GREATEST,
+ .classification = FUNC_MGT_SCALAR_FUNC,
+ .parameters = {.minParamNum = 2,
+ .maxParamNum = -1,
+ .paramInfoPattern = 1,
+ .inputParaInfo[0][0] = {.isLastParam = true,
+ .startParam = 1,
+ .endParam = -1,
+ .validDataType = FUNC_PARAM_SUPPORT_NUMERIC_TYPE | FUNC_PARAM_SUPPORT_NULL_TYPE | FUNC_PARAM_SUPPORT_BOOL_TYPE | FUNC_PARAM_SUPPORT_TIMESTAMP_TYPE | FUNC_PARAM_SUPPORT_VARCHAR_TYPE | FUNC_PARAM_SUPPORT_NCHAR_TYPE,
+ .validNodeType = FUNC_PARAM_SUPPORT_EXPR_NODE,
+ .paramAttribute = FUNC_PARAM_NO_SPECIFIC_ATTRIBUTE,
+ .valueRangeFlag = FUNC_PARAM_NO_SPECIFIC_VALUE,},
+ .outputParaInfo = {.validDataType = FUNC_PARAM_SUPPORT_ALL_TYPE}},
+ .translateFunc = translateGreatestleast,
+ .getEnvFunc = NULL,
+ .initFunc = NULL,
+ .sprocessFunc = greatestFunction,
+ .finalizeFunc = NULL
+ },
+ {
+ .name = "least",
+ .type = FUNCTION_TYPE_LEAST,
+ .classification = FUNC_MGT_SCALAR_FUNC,
+ .parameters = {.minParamNum = 2,
+ .maxParamNum = -1,
+ .paramInfoPattern = 1,
+ .inputParaInfo[0][0] = {.isLastParam = true,
+ .startParam = 1,
+ .endParam = -1,
+ .validDataType = FUNC_PARAM_SUPPORT_NUMERIC_TYPE | FUNC_PARAM_SUPPORT_NULL_TYPE | FUNC_PARAM_SUPPORT_BOOL_TYPE | FUNC_PARAM_SUPPORT_TIMESTAMP_TYPE | FUNC_PARAM_SUPPORT_VARCHAR_TYPE | FUNC_PARAM_SUPPORT_NCHAR_TYPE,
+ .validNodeType = FUNC_PARAM_SUPPORT_EXPR_NODE,
+ .paramAttribute = FUNC_PARAM_NO_SPECIFIC_ATTRIBUTE,
+ .valueRangeFlag = FUNC_PARAM_NO_SPECIFIC_VALUE,},
+ .outputParaInfo = {.validDataType = FUNC_PARAM_SUPPORT_ALL_TYPE}},
+ .translateFunc = translateGreatestleast,
+ .getEnvFunc = NULL,
+ .initFunc = NULL,
+ .sprocessFunc = leastFunction,
+ .finalizeFunc = NULL
+ },
};
// clang-format on
diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index 91be791dff..876b05d55f 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -797,7 +797,7 @@ static bool funcNotSupportStringSma(SFunctionNode* pFunc) {
}
EFuncDataRequired statisDataRequired(SFunctionNode* pFunc, STimeWindow* pTimeWindow) {
- if(funcNotSupportStringSma(pFunc)) {
+ if (funcNotSupportStringSma(pFunc)) {
return FUNC_DATA_REQUIRED_DATA_LOAD;
}
return FUNC_DATA_REQUIRED_SMA_LOAD;
@@ -6611,7 +6611,7 @@ int32_t blockDBUsageFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
double compressRadio = 0;
if (rawDataSize != 0) {
compressRadio = totalDiskSize * 100 / (double)rawDataSize;
- len = tsnprintf(varDataVal(st), sizeof(st) - VARSTR_HEADER_SIZE, "Compress_radio=[%.2f]", compressRadio);
+ len = tsnprintf(varDataVal(st), sizeof(st) - VARSTR_HEADER_SIZE, "Compress_radio=[%.2f%]", compressRadio);
} else {
len = tsnprintf(varDataVal(st), sizeof(st) - VARSTR_HEADER_SIZE, "Compress_radio=[NULL]");
}
diff --git a/source/libs/index/src/indexFilter.c b/source/libs/index/src/indexFilter.c
index 1d1bc66414..257ad3d8ea 100644
--- a/source/libs/index/src/indexFilter.c
+++ b/source/libs/index/src/indexFilter.c
@@ -532,9 +532,17 @@ int32_t sifStr2Num(char *buf, int32_t len, int8_t type, void *val) {
static int32_t sifSetFltParam(SIFParam *left, SIFParam *right, SDataTypeBuf *typedata, SMetaFltParam *param) {
int32_t code = 0;
int8_t ltype = left->colValType, rtype = right->colValType;
- if (!IS_NUMERIC_TYPE(ltype) || !((IS_NUMERIC_TYPE(rtype)) || rtype == TSDB_DATA_TYPE_VARCHAR)) {
- return TSDB_CODE_INVALID_PARA;
+ // if (!IS_NUMERIC_TYPE(ltype) || !((IS_NUMERIC_TYPE(rtype)) || rtype == TSDB_DATA_TYPE_VARCHAR)) {
+ // return TSDB_CODE_INVALID_PARA;
+ // }
+ if (IS_VAR_DATA_TYPE(ltype)) {
+ if (ltype == TSDB_DATA_TYPE_VARCHAR || ltype == TSDB_DATA_TYPE_BINARY || ltype == TSDB_DATA_TYPE_VARBINARY) {
+ return 0;
+ } else {
+ return TSDB_CODE_INVALID_PARA;
+ }
}
+
if (ltype == TSDB_DATA_TYPE_FLOAT) {
float f = 0;
if (IS_NUMERIC_TYPE(rtype)) {
diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index 367d0f4b4f..608b531d3c 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -2118,12 +2118,15 @@ static int32_t pdcDealProject(SOptimizeContext* pCxt, SProjectLogicNode* pProjec
if (NULL != pProject->node.pLimit || NULL != pProject->node.pSlimit) {
return TSDB_CODE_SUCCESS;
}
+ SLogicNode* pChild = (SLogicNode*)nodesListGetNode(pProject->node.pChildren, 0);
+ if(pChild->pLimit != NULL) {
+ return TSDB_CODE_SUCCESS;
+ }
int32_t code = TSDB_CODE_SUCCESS;
SNode* pProjCond = NULL;
code = rewriteProjectCondForPushDown(pCxt, pProject, &pProjCond);
if (TSDB_CODE_SUCCESS == code) {
- SLogicNode* pChild = (SLogicNode*)nodesListGetNode(pProject->node.pChildren, 0);
code = pdcPushDownCondToChild(pCxt, pChild, &pProjCond);
}
diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c
index f3b56da372..280a469153 100644
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@@ -1,11 +1,14 @@
+#include
#include "cJSON.h"
#include "function.h"
#include "scalar.h"
#include "sclInt.h"
#include "sclvector.h"
#include "tdatablock.h"
+#include "tdef.h"
#include "tjson.h"
#include "ttime.h"
+#include "filter.h"
typedef float (*_float_fn)(float);
typedef float (*_float_fn_2)(float, float);
@@ -4403,3 +4406,136 @@ int32_t modeScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam
return selectScalarFunction(pInput, inputNum, pOutput);
}
+typedef struct SCovertScarlarParam {
+ SScalarParam covertParam;
+ SScalarParam *param;
+ bool converted;
+} SCovertScarlarParam;
+
+void freeSCovertScarlarParams(SCovertScarlarParam *pCovertParams, int32_t num) {
+ if (pCovertParams == NULL) {
+ return;
+ }
+ for (int32_t i = 0; i < num; i++) {
+ if (pCovertParams[i].converted) {
+ sclFreeParam(pCovertParams[i].param);
+ }
+ }
+ taosMemoryFree(pCovertParams);
+}
+
+static int32_t vectorCompareAndSelect(SCovertScarlarParam *pParams, int32_t numOfRows, int numOfCols,
+ int32_t *resultColIndex, EOperatorType optr) {
+ int32_t code = TSDB_CODE_SUCCESS;
+ int32_t type = GET_PARAM_TYPE(pParams[0].param);
+
+ __compar_fn_t fp = NULL;
+ code = filterGetCompFunc(&fp, type, optr);
+ if(code != TSDB_CODE_SUCCESS) {
+ qError("failed to get compare function, func:%s type:%d, optr:%d", __FUNCTION__, type, optr);
+ return code;
+ }
+
+ for (int32_t i = 0; i < numOfRows; i++) {
+ int selectIndex = 0;
+ if (colDataIsNull_s(pParams[selectIndex].param->columnData, i)) {
+ resultColIndex[i] = -1;
+ continue;
+ }
+ for (int32_t j = 1; j < numOfCols; j++) {
+ if (colDataIsNull_s(pParams[j].param->columnData, i)) {
+ resultColIndex[i] = -1;
+ break;
+ } else {
+ int32_t leftRowNo = pParams[selectIndex].param->numOfRows == 1 ? 0 : i;
+ int32_t rightRowNo = pParams[j].param->numOfRows == 1 ? 0 : i;
+ char *pLeftData = colDataGetData(pParams[selectIndex].param->columnData, leftRowNo);
+ char *pRightData = colDataGetData(pParams[j].param->columnData, rightRowNo);
+ bool pRes = filterDoCompare(fp, optr, pLeftData, pRightData);
+ if (!pRes) {
+ selectIndex = j;
+ }
+ }
+ resultColIndex[i] = selectIndex;
+ }
+ }
+
+ return code;
+}
+
+static int32_t greatestLeastImpl(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput, EOperatorType order) {
+ int32_t code = TSDB_CODE_SUCCESS;
+ SColumnInfoData *pOutputData = pOutput[0].columnData;
+ int16_t outputType = GET_PARAM_TYPE(&pOutput[0]);
+ int64_t outputLen = GET_PARAM_BYTES(&pOutput[0]);
+
+ SCovertScarlarParam *pCovertParams = NULL;
+ int32_t *resultColIndex = NULL;
+
+ int32_t numOfRows = 0;
+ bool IsNullType = outputType == TSDB_DATA_TYPE_NULL ? true : false;
+ // If any column is NULL type, the output is NULL type
+ for (int32_t i = 0; i < inputNum; i++) {
+ if (IsNullType) {
+ break;
+ }
+ if (numOfRows != 0 && numOfRows != pInput[i].numOfRows && pInput[i].numOfRows != 1 && numOfRows != 1) {
+ qError("input rows not match, func:%s, rows:%d, %d", __FUNCTION__, numOfRows, pInput[i].numOfRows);
+ code = TSDB_CODE_TSC_INTERNAL_ERROR;
+ goto _return;
+ }
+ numOfRows = TMAX(numOfRows, pInput[i].numOfRows);
+ IsNullType |= IS_NULL_TYPE(GET_PARAM_TYPE(&pInput[i]));
+ }
+
+ if (IsNullType) {
+ colDataSetNNULL(pOutputData, 0, numOfRows);
+ pOutput->numOfRows = numOfRows;
+ return TSDB_CODE_SUCCESS;
+ }
+ pCovertParams = taosMemoryMalloc(inputNum * sizeof(SCovertScarlarParam));
+ for (int32_t j = 0; j < inputNum; j++) {
+ SScalarParam *pParam = &pInput[j];
+ int16_t oldType = GET_PARAM_TYPE(&pInput[j]);
+ if (oldType != outputType) {
+ pCovertParams[j].covertParam = (SScalarParam){0};
+ setTzCharset(&pCovertParams[j].covertParam, pParam->tz, pParam->charsetCxt);
+ SCL_ERR_JRET(vectorConvertSingleCol(pParam, &pCovertParams[j].covertParam, outputType, 0, pParam->numOfRows));
+ pCovertParams[j].param = &pCovertParams[j].covertParam;
+ pCovertParams[j].converted = true;
+ } else {
+ pCovertParams[j].param = pParam;
+ pCovertParams[j].converted = false;
+ }
+ }
+
+ resultColIndex = taosMemoryCalloc(numOfRows, sizeof(int32_t));
+ SCL_ERR_JRET(vectorCompareAndSelect(pCovertParams, numOfRows, inputNum, resultColIndex, order));
+
+ for (int32_t i = 0; i < numOfRows; i++) {
+ int32_t index = resultColIndex[i];
+ if (index == -1) {
+ colDataSetNULL(pOutputData, i);
+ continue;
+ }
+ int32_t rowNo = pCovertParams[index].param->numOfRows == 1 ? 0 : i;
+ char *data = colDataGetData(pCovertParams[index].param->columnData, rowNo);
+ SCL_ERR_JRET(colDataSetVal(pOutputData, i, data, false));
+ }
+
+ pOutput->numOfRows = numOfRows;
+
+_return:
+ freeSCovertScarlarParams(pCovertParams, inputNum);
+ taosMemoryFree(resultColIndex);
+ return code;
+}
+
+int32_t greatestFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
+ return greatestLeastImpl(pInput, inputNum, pOutput, OP_TYPE_GREATER_THAN);
+}
+
+int32_t leastFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
+ return greatestLeastImpl(pInput, inputNum, pOutput, OP_TYPE_LOWER_THAN);
+}
+
diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c
index 14dae1226d..ff45baa1e0 100644
--- a/source/libs/scalar/src/sclvector.c
+++ b/source/libs/scalar/src/sclvector.c
@@ -996,7 +996,7 @@ int32_t vectorConvertSingleColImpl(const SScalarParam *pIn, SScalarParam *pOut,
}
int8_t gConvertTypes[TSDB_DATA_TYPE_MAX][TSDB_DATA_TYPE_MAX] = {
- /*NULL BOOL TINY SMAL INT BIG FLOA DOUB VARC TIME NCHA UTIN USMA UINT UBIG JSON VARB DECI BLOB MEDB GEOM*/
+ /* NULL BOOL TINY SMAL INT BIG FLOA DOUB VARC TIME NCHA UTIN USMA UINT UBIG JSON VARB DECI BLOB MEDB GEOM*/
/*NULL*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/*BOOL*/ 0, 0, 2, 3, 4, 5, 6, 7, 5, 9, 5, 11, 12, 13, 14, 0, -1, 0, 0, 0, -1,
/*TINY*/ 0, 0, 0, 3, 4, 5, 6, 7, 5, 9, 5, 3, 4, 5, 7, 0, -1, 0, 0, 0, -1,
@@ -1021,7 +1021,7 @@ int8_t gConvertTypes[TSDB_DATA_TYPE_MAX][TSDB_DATA_TYPE_MAX] = {
};
int8_t gDisplyTypes[TSDB_DATA_TYPE_MAX][TSDB_DATA_TYPE_MAX] = {
- /*NULL BOOL TINY SMAL INT BIGI FLOA DOUB VARC TIM NCHA UTIN USMA UINT UBIG JSON VARB DECI BLOB MEDB GEOM*/
+ /* NULL BOOL TINY SMAL INT BIGI FLOA DOUB VARC TIM NCHA UTIN USMA UINT UBIG JSON VARB DECI BLOB MEDB GEOM*/
/*NULL*/ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, -1, 20,
/*BOOL*/ 0, 1, 2, 3, 4, 5, 6, 7, 8, 5, 10, 11, 12, 13, 14, -1, -1, -1, -1, -1, -1,
/*TINY*/ 0, 0, 2, 3, 4, 5, 8, 8, 8, 5, 10, 3, 4, 5, 8, -1, -1, -1, -1, -1, -1,
diff --git a/source/libs/stream/src/streamCheckStatus.c b/source/libs/stream/src/streamCheckStatus.c
index ebb13654b7..29da3fc88e 100644
--- a/source/libs/stream/src/streamCheckStatus.c
+++ b/source/libs/stream/src/streamCheckStatus.c
@@ -717,7 +717,7 @@ void handleNotReadyDownstreamTask(SStreamTask* pTask, SArray* pNotReadyList) {
// The restart of all tasks requires that all tasks should not have active timer for now. Therefore, the execution
// of restart in timer thread will result in a deadlock.
int32_t addDownstreamFailedStatusResultAsync(SMsgCb* pMsgCb, int32_t vgId, int64_t streamId, int32_t taskId) {
- return streamTaskSchedTask(pMsgCb, vgId, streamId, taskId, STREAM_EXEC_T_ADD_FAILED_TASK);
+ return streamTaskSchedTask(pMsgCb, vgId, streamId, taskId, STREAM_EXEC_T_ADD_FAILED_TASK, false);
}
static void doCleanup(SStreamTask* pTask, SArray* pNotReadyList, SArray* pTimeoutList, void* param) {
diff --git a/source/libs/stream/src/streamCheckpoint.c b/source/libs/stream/src/streamCheckpoint.c
index eb8f2c741a..afda288b90 100644
--- a/source/libs/stream/src/streamCheckpoint.c
+++ b/source/libs/stream/src/streamCheckpoint.c
@@ -93,7 +93,7 @@ int32_t appendCheckpointIntoInputQ(SStreamTask* pTask, int32_t checkpointType, i
return TSDB_CODE_OUT_OF_MEMORY;
}
- return streamTrySchedExec(pTask);
+ return streamTrySchedExec(pTask, true);
}
int32_t streamProcessCheckpointSourceReq(SStreamTask* pTask, SStreamCheckpointSourceReq* pReq) {
@@ -814,15 +814,17 @@ static int32_t getCheckpointDataMeta(const char* id, const char* path, SArray* l
}
int32_t uploadCheckpointData(SStreamTask* pTask, int64_t checkpointId, int64_t dbRefId, ECHECKPOINT_BACKUP_TYPE type) {
- int32_t code = 0;
- char* path = NULL;
-
+ int32_t code = 0;
+ char* path = NULL;
+ int64_t chkptSize = 0;
SStreamMeta* pMeta = pTask->pMeta;
const char* idStr = pTask->id.idStr;
int64_t now = taosGetTimestampMs();
SArray* toDelFiles = taosArrayInit(4, POINTER_BYTES);
if (toDelFiles == NULL) {
+ stError("s-task:%s failed to prepare array list during upload checkpoint, code:%s", pTask->id.idStr,
+ tstrerror(terrno));
return terrno;
}
@@ -848,11 +850,11 @@ int32_t uploadCheckpointData(SStreamTask* pTask, int64_t checkpointId, int64_t d
}
}
- if (code == TSDB_CODE_SUCCESS) {
- int32_t size = taosArrayGetSize(toDelFiles);
- stDebug("s-task:%s remove redundant %d files", idStr, size);
+ int32_t num = taosArrayGetSize(toDelFiles);
+ if (code == TSDB_CODE_SUCCESS && num > 0) {
+ stDebug("s-task:%s remove redundant %d files", idStr, num);
- for (int i = 0; i < size; i++) {
+ for (int i = 0; i < num; i++) {
char* pName = taosArrayGetP(toDelFiles, i);
code = deleteCheckpointFile(idStr, pName);
if (code != 0) {
@@ -868,12 +870,13 @@ int32_t uploadCheckpointData(SStreamTask* pTask, int64_t checkpointId, int64_t d
double el = (taosGetTimestampMs() - now) / 1000.0;
if (code == TSDB_CODE_SUCCESS) {
- stDebug("s-task:%s complete update checkpointId:%" PRId64 ", elapsed time:%.2fs remove local checkpoint data %s",
- idStr, checkpointId, el, path);
- taosRemoveDir(path);
+ code = taosGetDirSize(path, &chkptSize);
+ stDebug("s-task:%s complete upload checkpointId:%" PRId64
+ ", elapsed time:%.2fs, checkpointSize:%.2fKiB local dir:%s",
+ idStr, checkpointId, el, SIZE_IN_KiB(chkptSize), path);
} else {
- stDebug("s-task:%s failed to upload checkpointId:%" PRId64 " keep local checkpoint data, elapsed time:%.2fs", idStr,
- checkpointId, el);
+ stDebug("s-task:%s failed to upload checkpointId:%" PRId64 " elapsed time:%.2fs, checkpointSize:%.2fKiB", idStr,
+ checkpointId, el, SIZE_IN_KiB(chkptSize));
}
taosMemoryFree(path);
@@ -883,7 +886,7 @@ int32_t uploadCheckpointData(SStreamTask* pTask, int64_t checkpointId, int64_t d
int32_t streamTaskRemoteBackupCheckpoint(SStreamTask* pTask, int64_t checkpointId) {
ECHECKPOINT_BACKUP_TYPE type = streamGetCheckpointBackupType();
if (type == DATA_UPLOAD_DISABLE) {
- stDebug("s-task:%s not allowed to upload checkpoint data", pTask->id.idStr);
+ stDebug("s-task:%s not config to backup checkpoint data at snode, checkpointId:%"PRId64, pTask->id.idStr, checkpointId);
return 0;
}
@@ -925,6 +928,9 @@ int32_t streamTaskBuildCheckpoint(SStreamTask* pTask) {
if (code != TSDB_CODE_SUCCESS) {
stError("s-task:%s gen checkpoint:%" PRId64 " failed, code:%s", id, ckId, tstrerror(terrno));
}
+
+ int64_t et = taosGetTimestampMs();
+ stDebug("s-task:%s gen local checkpoint completed, elapsed time:%.2fs", id, (et - startTs) / 1000.0);
}
// TODO: monitoring the checkpoint-source msg
diff --git a/source/libs/stream/src/streamDispatch.c b/source/libs/stream/src/streamDispatch.c
index 24ac193937..f08b4a7922 100644
--- a/source/libs/stream/src/streamDispatch.c
+++ b/source/libs/stream/src/streamDispatch.c
@@ -1834,6 +1834,7 @@ int32_t streamProcessDispatchMsg(SStreamTask* pTask, SStreamDispatchReq* pReq, S
int32_t status = 0;
SStreamMeta* pMeta = pTask->pMeta;
const char* id = pTask->id.idStr;
+ bool chkptMsg = false;
stDebug("s-task:%s receive dispatch msg from taskId:0x%x(vgId:%d), msgLen:%" PRId64 ", msgId:%d", id,
pReq->upstreamTaskId, pReq->upstreamNodeId, pReq->totalLen, pReq->msgId);
@@ -1863,6 +1864,7 @@ int32_t streamProcessDispatchMsg(SStreamTask* pTask, SStreamDispatchReq* pReq, S
// blocked. Note that there is no race condition here.
if (pReq->type == STREAM_INPUT__CHECKPOINT_TRIGGER) {
streamTaskCloseUpstreamInput(pTask, pReq->upstreamTaskId);
+ chkptMsg = true;
stDebug("s-task:%s close inputQ for upstream:0x%x, msgId:%d", id, pReq->upstreamTaskId, pReq->msgId);
} else if (pReq->type == STREAM_INPUT__TRANS_STATE) {
stDebug("s-task:%s recv trans-state msgId:%d from upstream:0x%x", id, pReq->msgId, pReq->upstreamTaskId);
@@ -1890,5 +1892,5 @@ int32_t streamProcessDispatchMsg(SStreamTask* pTask, SStreamDispatchReq* pReq, S
tmsgSendRsp(pRsp);
}
- return streamTrySchedExec(pTask);
+ return streamTrySchedExec(pTask, chkptMsg);
}
diff --git a/source/libs/stream/src/streamHb.c b/source/libs/stream/src/streamHb.c
index ca5b6630fd..a6d0142010 100644
--- a/source/libs/stream/src/streamHb.c
+++ b/source/libs/stream/src/streamHb.c
@@ -243,6 +243,8 @@ int32_t streamMetaSendHbHelper(SStreamMeta* pMeta) {
continue;
}
+ // todo: this lock may blocked by lock in streamMetaStartOneTask function, which may lock a very long time when
+ // trying to load remote checkpoint data
streamMutexLock(&pTask->lock);
STaskStatusEntry entry = streamTaskGetStatusEntry(pTask);
streamMutexUnlock(&pTask->lock);
diff --git a/source/libs/stream/src/streamMeta.c b/source/libs/stream/src/streamMeta.c
index 605cf3fe21..350c71204a 100644
--- a/source/libs/stream/src/streamMeta.c
+++ b/source/libs/stream/src/streamMeta.c
@@ -1364,6 +1364,10 @@ void streamMetaUpdateStageRole(SStreamMeta* pMeta, int64_t stage, bool isLeader)
}
pMeta->role = (isLeader) ? NODE_ROLE_LEADER : NODE_ROLE_FOLLOWER;
+ if (!isLeader) {
+ streamMetaResetStartInfo(&pMeta->startInfo, pMeta->vgId);
+ }
+
streamMetaWUnLock(pMeta);
if (isLeader) {
diff --git a/source/libs/stream/src/streamQueue.c b/source/libs/stream/src/streamQueue.c
index 7c7ef83d6d..5a507358ee 100644
--- a/source/libs/stream/src/streamQueue.c
+++ b/source/libs/stream/src/streamQueue.c
@@ -144,11 +144,20 @@ void streamQueueNextItemInSourceQ(SStreamQueue* pQueue, SStreamQueueItem** pItem
// let's try the ordinary input q
pQueue->qItem = NULL;
- int32_t num = taosGetQitem(pQueue->qall, &pQueue->qItem);
+ int32_t code = taosGetQitem(pQueue->qall, &pQueue->qItem);
+ if (code) {
+ stError("s-task:%s failed to extract data from inputQ, code:%s", id, tstrerror(code));
+ }
if (pQueue->qItem == NULL) {
- num = taosReadAllQitems(pQueue->pQueue, pQueue->qall);
- num = taosGetQitem(pQueue->qall, &pQueue->qItem);
+ code = taosReadAllQitems(pQueue->pQueue, pQueue->qall);
+ if (code) {
+ stError("s-task:%s failed to read qitem into qall, code:%s", id, tstrerror(code));
+ }
+ code = taosGetQitem(pQueue->qall, &pQueue->qItem);
+ if (code) {
+ stError("s-task:%s failed to extract data from inputQ(qall), code:%s", id, tstrerror(code));
+ }
}
*pItem = streamQueueCurItem(pQueue);
diff --git a/source/libs/stream/src/streamSched.c b/source/libs/stream/src/streamSched.c
index 1f76f349ae..367e54d1a1 100644
--- a/source/libs/stream/src/streamSched.c
+++ b/source/libs/stream/src/streamSched.c
@@ -93,17 +93,21 @@ void streamSetupScheduleTrigger(SStreamTask* pTask) {
}
}
-int32_t streamTrySchedExec(SStreamTask* pTask) {
+int32_t streamTrySchedExec(SStreamTask* pTask, bool chkptQueue) {
if (streamTaskSetSchedStatusWait(pTask)) {
- return streamTaskSchedTask(pTask->pMsgCb, pTask->info.nodeId, pTask->id.streamId, pTask->id.taskId, 0);
+ return streamTaskSchedTask(pTask->pMsgCb, pTask->info.nodeId, pTask->id.streamId, pTask->id.taskId, 0, chkptQueue);
} else {
- stTrace("s-task:%s not launch task since sched status:%d", pTask->id.idStr, pTask->status.schedStatus);
+ if (chkptQueue) {
+ stWarn("s-task:%s not launch task in chkpt queue, may delay checkpoint procedure", pTask->id.idStr);
+ } else {
+ stTrace("s-task:%s not launch task since sched status:%d", pTask->id.idStr, pTask->status.schedStatus);
+ }
}
return 0;
}
-int32_t streamTaskSchedTask(SMsgCb* pMsgCb, int32_t vgId, int64_t streamId, int32_t taskId, int32_t execType) {
+int32_t streamTaskSchedTask(SMsgCb* pMsgCb, int32_t vgId, int64_t streamId, int32_t taskId, int32_t execType, bool chkptExec) {
int32_t code = 0;
int32_t tlen = 0;
@@ -142,10 +146,18 @@ int32_t streamTaskSchedTask(SMsgCb* pMsgCb, int32_t vgId, int64_t streamId, int3
stDebug("vgId:%d create msg to exec, type:%d, %s", vgId, execType, streamTaskGetExecType(execType));
}
- SRpcMsg msg = {.msgType = TDMT_STREAM_TASK_RUN, .pCont = buf, .contLen = tlen + sizeof(SMsgHead)};
- code = tmsgPutToQueue(pMsgCb, STREAM_QUEUE, &msg);
- if (code) {
- stError("vgId:%d failed to put msg into stream queue, code:%s, %x", vgId, tstrerror(code), taskId);
+ if (chkptExec) {
+ SRpcMsg msg = {.msgType = TDMT_STREAM_CHKPT_EXEC, .pCont = buf, .contLen = tlen + sizeof(SMsgHead)};
+ code = tmsgPutToQueue(pMsgCb, STREAM_CHKPT_QUEUE, &msg);
+ if (code) {
+ stError("vgId:%d failed to put msg into stream chkpt queue, code:%s, %x", vgId, tstrerror(code), taskId);
+ }
+ } else {
+ SRpcMsg msg = {.msgType = TDMT_STREAM_TASK_RUN, .pCont = buf, .contLen = tlen + sizeof(SMsgHead)};
+ code = tmsgPutToQueue(pMsgCb, STREAM_QUEUE, &msg);
+ if (code) {
+ stError("vgId:%d failed to put msg into stream queue, code:%s, %x", vgId, tstrerror(code), taskId);
+ }
}
return code;
}
@@ -191,12 +203,17 @@ void streamTaskResumeHelper(void* param, void* tmrId) {
return;
}
- code = streamTaskSchedTask(pTask->pMsgCb, pTask->info.nodeId, pId->streamId, pId->taskId, STREAM_EXEC_T_RESUME_TASK);
+ code = streamTaskSchedTask(pTask->pMsgCb, pTask->info.nodeId, pId->streamId, pId->taskId, STREAM_EXEC_T_RESUME_TASK,
+ (p.state == TASK_STATUS__CK));
if (code) {
stError("s-task:%s sched task failed, code:%s", pId->idStr, tstrerror(code));
} else {
- stDebug("trigger to resume s-task:%s after idled for %dms", pId->idStr, pTask->status.schedIdleTime);
-
+ if (p.state == TASK_STATUS__CK) {
+ stDebug("trigger to resume s-task:%s in stream chkpt queue after idled for %dms", pId->idStr,
+ pTask->status.schedIdleTime);
+ } else {
+ stDebug("trigger to resume s-task:%s after idled for %dms", pId->idStr, pTask->status.schedIdleTime);
+ }
// release the task ref count
streamTaskClearSchedIdleInfo(pTask);
}
@@ -339,7 +356,7 @@ void streamTaskSchedHelper(void* param, void* tmrId) {
}
}
- code = streamTrySchedExec(pTask);
+ code = streamTrySchedExec(pTask, false);
if (code != TSDB_CODE_SUCCESS) {
stError("s-task:%s failed to sched to run, wait for next time", pTask->id.idStr);
}
diff --git a/source/libs/stream/src/streamTask.c b/source/libs/stream/src/streamTask.c
index 378aaa27d0..f7ae4915ec 100644
--- a/source/libs/stream/src/streamTask.c
+++ b/source/libs/stream/src/streamTask.c
@@ -1194,7 +1194,7 @@ int32_t streamProcessRetrieveReq(SStreamTask* pTask, SStreamRetrieveReq* pReq) {
if (code != 0) {
return code;
}
- return streamTrySchedExec(pTask);
+ return streamTrySchedExec(pTask, false);
}
void streamTaskSetRemoveBackendFiles(SStreamTask* pTask) { pTask->status.removeBackendFiles = true; }
diff --git a/source/libs/stream/src/tstreamFileState.c b/source/libs/stream/src/tstreamFileState.c
index d6dfde1ee6..0255ac01b5 100644
--- a/source/libs/stream/src/tstreamFileState.c
+++ b/source/libs/stream/src/tstreamFileState.c
@@ -394,14 +394,17 @@ int32_t clearFlushedRowBuff(SStreamFileState* pFileState, SStreamSnapshot* pFlus
pFileState->flushMark = TMAX(pFileState->flushMark, pFileState->getTs(pPos->pKey));
pFileState->stateBuffRemoveByPosFn(pFileState, pPos);
- SListNode* tmp = tdListPopNode(pFileState->usedBuffs, pNode);
- taosMemoryFreeClear(tmp);
+ if (pPos->beUsed == false) {
+ SListNode* tmp = tdListPopNode(pFileState->usedBuffs, pNode);
+ taosMemoryFreeClear(tmp);
+ }
if (pPos->pRowBuff) {
i++;
}
}
}
}
+ qDebug("clear flushed row buff. %d rows to disk. is all:%d", listNEles(pFlushList), all);
_end:
if (code != TSDB_CODE_SUCCESS) {
@@ -433,7 +436,6 @@ int32_t popUsedBuffs(SStreamFileState* pFileState, SStreamSnapshot* pFlushList,
SRowBuffPos* pPos = *(SRowBuffPos**)pNode->data;
if (pPos->beUsed == used) {
if (used && !pPos->pRowBuff) {
- QUERY_CHECK_CONDITION((pPos->needFree == true), code, lino, _end, TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR);
continue;
}
code = tdListAppend(pFlushList, &pPos);
@@ -441,8 +443,10 @@ int32_t popUsedBuffs(SStreamFileState* pFileState, SStreamSnapshot* pFlushList,
pFileState->flushMark = TMAX(pFileState->flushMark, pFileState->getTs(pPos->pKey));
pFileState->stateBuffRemoveByPosFn(pFileState, pPos);
- SListNode* tmp = tdListPopNode(pFileState->usedBuffs, pNode);
- taosMemoryFreeClear(tmp);
+ if (pPos->beUsed == false) {
+ SListNode* tmp = tdListPopNode(pFileState->usedBuffs, pNode);
+ taosMemoryFreeClear(tmp);
+ }
if (pPos->pRowBuff) {
i++;
}
@@ -511,9 +515,12 @@ int32_t clearRowBuff(SStreamFileState* pFileState) {
if (pFileState->deleteMark != INT64_MAX) {
clearExpiredRowBuff(pFileState, pFileState->maxTs - pFileState->deleteMark, false);
}
- if (isListEmpty(pFileState->freeBuffs)) {
- return flushRowBuff(pFileState);
- }
+ do {
+ int32_t code = flushRowBuff(pFileState);
+ if (code != TSDB_CODE_SUCCESS) {
+ return code;
+ }
+ } while (isListEmpty(pFileState->freeBuffs) && pFileState->curRowCount == pFileState->maxRowCount);
return TSDB_CODE_SUCCESS;
}
@@ -756,10 +763,10 @@ int32_t getRowBuffByPos(SStreamFileState* pFileState, SRowBuffPos* pPos, void**
QUERY_CHECK_CODE(code, lino, _end);
(*pVal) = pPos->pRowBuff;
- if (!pPos->needFree) {
- code = tdListPrepend(pFileState->usedBuffs, &pPos);
- QUERY_CHECK_CODE(code, lino, _end);
- }
+ // if (!pPos->needFree) {
+ // code = tdListPrepend(pFileState->usedBuffs, &pPos);
+ // QUERY_CHECK_CODE(code, lino, _end);
+ // }
_end:
if (code != TSDB_CODE_SUCCESS) {
diff --git a/source/libs/tdb/src/db/tdbPCache.c b/source/libs/tdb/src/db/tdbPCache.c
index b0bcbd1a4c..23e6e5414e 100644
--- a/source/libs/tdb/src/db/tdbPCache.c
+++ b/source/libs/tdb/src/db/tdbPCache.c
@@ -345,7 +345,9 @@ static SPage *tdbPCacheFetchImpl(SPCache *pCache, const SPgid *pPgid, TXN *pTxn)
if (!pPage && pTxn->xMalloc != NULL) {
ret = tdbPageCreate(pCache->szPage, &pPage, pTxn->xMalloc, pTxn->xArg);
if (ret < 0 || pPage == NULL) {
- tdbError("tdb/pcache: ret: %" PRId32 " pPage: %p, page create failed.", ret, pPage);
+ // when allocating from bufpool failed, it's time to flush cache.
+ // tdbError("tdb/pcache: ret: %" PRId32 " pPage: %p, page create failed.", ret, pPage);
+
terrno = ret;
return NULL;
}
@@ -551,5 +553,4 @@ static void tdbPCacheCloseImpl(SPCache *pCache) {
tdbOsFree(pCache->pgHash);
tdbPCacheDestroyLock(pCache);
- return ;
}
diff --git a/source/libs/tdb/src/db/tdbTable.c b/source/libs/tdb/src/db/tdbTable.c
index 6dc6aa0940..4c73d6470e 100644
--- a/source/libs/tdb/src/db/tdbTable.c
+++ b/source/libs/tdb/src/db/tdbTable.c
@@ -104,7 +104,7 @@ int tdbTbOpen(const char *tbname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprF
}
#endif
-
+ /*
if (rollback) {
ret = tdbPagerRestoreJournals(pPager);
if (ret < 0) {
@@ -118,6 +118,13 @@ int tdbTbOpen(const char *tbname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprF
return ret;
}
}
+ */
+ // Always restore journal files with page flushing
+ ret = tdbPagerRestoreJournals(pPager);
+ if (ret < 0) {
+ tdbOsFree(pTb);
+ return ret;
+ }
// pTb->pBt
ret = tdbBtreeOpen(keyLen, valLen, pPager, tbname, pgno, keyCmprFn, pEnv, &(pTb->pBt));
diff --git a/source/libs/tdb/test/CMakeLists.txt b/source/libs/tdb/test/CMakeLists.txt
index 4715ccbd41..6319fce86b 100644
--- a/source/libs/tdb/test/CMakeLists.txt
+++ b/source/libs/tdb/test/CMakeLists.txt
@@ -18,3 +18,6 @@ target_link_libraries(tdbPageDefragmentTest tdb gtest gtest_main)
add_executable(tdbPageRecycleTest "tdbPageRecycleTest.cpp")
target_link_libraries(tdbPageRecycleTest tdb gtest gtest_main)
+# page flush testing
+add_executable(tdbPageFlushTest "tdbPageFlushTest.cpp")
+target_link_libraries(tdbPageFlushTest tdb gtest gtest_main)
diff --git a/source/libs/tdb/test/tdbPageFlushTest.cpp b/source/libs/tdb/test/tdbPageFlushTest.cpp
new file mode 100644
index 0000000000..170a28af76
--- /dev/null
+++ b/source/libs/tdb/test/tdbPageFlushTest.cpp
@@ -0,0 +1,582 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+#include
+
+#define ALLOW_FORBID_FUNC
+#include "os.h"
+#include "tdb.h"
+
+#include
+#include
+#include
+#include
+#include "tlog.h"
+
+typedef struct SPoolMem {
+ int64_t size;
+ struct SPoolMem *prev;
+ struct SPoolMem *next;
+} SPoolMem;
+
+static SPoolMem *openPool() {
+ SPoolMem *pPool = (SPoolMem *)taosMemoryMalloc(sizeof(*pPool));
+
+ pPool->prev = pPool->next = pPool;
+ pPool->size = 0;
+
+ return pPool;
+}
+
+static void clearPool(SPoolMem *pPool) {
+ SPoolMem *pMem;
+
+ do {
+ pMem = pPool->next;
+
+ if (pMem == pPool) break;
+
+ pMem->next->prev = pMem->prev;
+ pMem->prev->next = pMem->next;
+ pPool->size -= pMem->size;
+
+ taosMemoryFree(pMem);
+ } while (1);
+
+ assert(pPool->size == 0);
+}
+
+static void closePool(SPoolMem *pPool) {
+ clearPool(pPool);
+ taosMemoryFree(pPool);
+}
+
+static void *poolMalloc(void *arg, size_t size) {
+ void *ptr = NULL;
+ SPoolMem *pPool = (SPoolMem *)arg;
+ SPoolMem *pMem;
+
+ pMem = (SPoolMem *)taosMemoryMalloc(sizeof(*pMem) + size);
+ if (pMem == NULL) {
+ assert(0);
+ }
+
+ pMem->size = sizeof(*pMem) + size;
+ pMem->next = pPool->next;
+ pMem->prev = pPool;
+
+ pPool->next->prev = pMem;
+ pPool->next = pMem;
+ pPool->size += pMem->size;
+
+ ptr = (void *)(&pMem[1]);
+ return ptr;
+}
+
+static void *poolMallocRestricted(void *arg, size_t size) {
+ void *ptr = NULL;
+ SPoolMem *pPool = (SPoolMem *)arg;
+ SPoolMem *pMem;
+
+ if (pPool->size > 1024 * 1024 * 10) {
+ return NULL;
+ }
+
+ pMem = (SPoolMem *)taosMemoryMalloc(sizeof(*pMem) + size);
+ if (pMem == NULL) {
+ assert(0);
+ }
+
+ pMem->size = sizeof(*pMem) + size;
+ pMem->next = pPool->next;
+ pMem->prev = pPool;
+
+ pPool->next->prev = pMem;
+ pPool->next = pMem;
+ pPool->size += pMem->size;
+
+ ptr = (void *)(&pMem[1]);
+ return ptr;
+}
+
+static void poolFree(void *arg, void *ptr) {
+ SPoolMem *pPool = (SPoolMem *)arg;
+ SPoolMem *pMem;
+
+ pMem = &(((SPoolMem *)ptr)[-1]);
+
+ pMem->next->prev = pMem->prev;
+ pMem->prev->next = pMem->next;
+ pPool->size -= pMem->size;
+
+ taosMemoryFree(pMem);
+}
+
+static int tDefaultKeyCmpr(const void *pKey1, int keyLen1, const void *pKey2, int keyLen2) {
+ int mlen;
+ int cret;
+
+ ASSERT(keyLen1 > 0 && keyLen2 > 0 && pKey1 != NULL && pKey2 != NULL);
+
+ mlen = keyLen1 < keyLen2 ? keyLen1 : keyLen2;
+ cret = memcmp(pKey1, pKey2, mlen);
+ if (cret == 0) {
+ if (keyLen1 < keyLen2) {
+ cret = -1;
+ } else if (keyLen1 > keyLen2) {
+ cret = 1;
+ } else {
+ cret = 0;
+ }
+ }
+ return cret;
+}
+
+static int tKeyCmpr(const void *pKey1, int kLen1, const void *pKey2, int kLen2) {
+ int k1, k2;
+
+ std::string s1((char *)pKey1 + 3, kLen1 - 3);
+ std::string s2((char *)pKey2 + 3, kLen2 - 3);
+ k1 = stoi(s1);
+ k2 = stoi(s2);
+
+ if (k1 < k2) {
+ return -1;
+ } else if (k1 > k2) {
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
+static TDB *openEnv(char const *envName, int const pageSize, int const pageNum) {
+ TDB *pEnv = NULL;
+
+ int ret = tdbOpen(envName, pageSize, pageNum, &pEnv, 0, 0, NULL);
+ if (ret) {
+ pEnv = NULL;
+ }
+
+ return pEnv;
+}
+
+static void clearDb(char const *db) { taosRemoveDir(db); }
+
+static void generateBigVal(char *val, int valLen) {
+ for (int i = 0; i < valLen; ++i) {
+ char c = char(i & 0xff);
+ if (c == 0) {
+ c = 1;
+ }
+ val[i] = c;
+ }
+}
+
+static void insertOfp(void) {
+ int ret = 0;
+
+ // open Env
+ int const pageSize = 4096;
+ int const pageNum = 64;
+ TDB *pEnv = openEnv("tdb", pageSize, pageNum);
+ GTEST_ASSERT_NE(pEnv, nullptr);
+
+ // open db
+ TTB *pDb = NULL;
+ tdb_cmpr_fn_t compFunc = tKeyCmpr;
+ // ret = tdbTbOpen("ofp_insert.db", -1, -1, compFunc, pEnv, &pDb, 0);
+ ret = tdbTbOpen("ofp_insert.db", -1, -1, compFunc, pEnv, &pDb, 0);
+ GTEST_ASSERT_EQ(ret, 0);
+
+ // open the pool
+ SPoolMem *pPool = openPool();
+
+ // start a transaction
+ TXN *txn = NULL;
+
+ tdbBegin(pEnv, &txn, poolMalloc, poolFree, pPool, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED);
+
+ // generate value payload
+ // char val[((4083 - 4 - 3 - 2) + 1) * 100]; // pSize(4096) - amSize(1) - pageHdr(8) - footerSize(4)
+ char val[32605];
+ int valLen = sizeof(val) / sizeof(val[0]);
+ generateBigVal(val, valLen);
+
+ // insert the generated big data
+ char const *key = "key123456789";
+ ret = tdbTbInsert(pDb, key, strlen(key) + 1, val, valLen, txn);
+ GTEST_ASSERT_EQ(ret, 0);
+
+ // commit current transaction
+ tdbCommit(pEnv, txn);
+ tdbPostCommit(pEnv, txn);
+
+ closePool(pPool);
+
+ // Close a database
+ tdbTbClose(pDb);
+
+ // Close Env
+ tdbClose(pEnv);
+}
+
+static void insertMultipleOfp(void) {
+ int ret = 0;
+
+ // open Env
+ int const pageSize = 4096;
+ int const pageNum = 64;
+ TDB *pEnv = openEnv("tdb", pageSize, pageNum);
+ GTEST_ASSERT_NE(pEnv, nullptr);
+
+ // open db
+ TTB *pDb = NULL;
+ tdb_cmpr_fn_t compFunc = tKeyCmpr;
+ // ret = tdbTbOpen("ofp_insert.db", -1, -1, compFunc, pEnv, &pDb, 0);
+ ret = tdbTbOpen("ofp_insert.db", -1, -1, compFunc, pEnv, &pDb, 0);
+ GTEST_ASSERT_EQ(ret, 0);
+
+ // open the pool
+ SPoolMem *pPool = openPool();
+
+ // start a transaction
+ TXN *txn = NULL;
+
+ tdbBegin(pEnv, &txn, poolMallocRestricted, poolFree, pPool, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED);
+
+ // generate value payload
+ // char val[((4083 - 4 - 3 - 2) + 1) * 100]; // pSize(4096) - amSize(1) - pageHdr(8) - footerSize(4)
+ char val[32605];
+ int valLen = sizeof(val) / sizeof(val[0]);
+ generateBigVal(val, valLen);
+
+ // insert the generated big data
+ // char const *key = "key1";
+ for (int i = 0; i < 1024 * 4; ++i) {
+ // char const *key = "key123456789";
+ char key[32] = {0};
+ sprintf(key, "key-%d", i);
+ ret = tdbTbInsert(pDb, key, strlen(key) + 1, val, valLen, txn);
+ GTEST_ASSERT_EQ(ret, 0);
+ }
+
+ // commit current transaction
+ tdbCommit(pEnv, txn);
+ tdbPostCommit(pEnv, txn);
+
+ closePool(pPool);
+
+ // Close a database
+ tdbTbClose(pDb);
+
+ // Close Env
+ tdbClose(pEnv);
+}
+
+// TEST(TdbPageFlushTest, DISABLED_TbRestoreTest) {
+TEST(TdbPageFlushTest, TbRestoreTest) {
+ clearDb("tdb");
+
+ insertMultipleOfp();
+}
+
+// TEST(TdbPageFlushTest, DISABLED_TbRestoreTest2) {
+TEST(TdbPageFlushTest, TbRestoreTest2) {
+ clearDb("tdb");
+
+ int ret = 0;
+
+ // open Env
+ int const pageSize = 4096;
+ int const pageNum = 64;
+ TDB *pEnv = openEnv("tdb", pageSize, pageNum);
+ GTEST_ASSERT_NE(pEnv, nullptr);
+
+ // open db
+ TTB *pDb = NULL;
+ tdb_cmpr_fn_t compFunc = tKeyCmpr;
+ // ret = tdbTbOpen("ofp_insert.db", -1, -1, compFunc, pEnv, &pDb, 0);
+ ret = tdbTbOpen("ofp_insert.db", -1, -1, compFunc, pEnv, &pDb, 0);
+ GTEST_ASSERT_EQ(ret, 0);
+
+ // open the pool
+ SPoolMem *pPool = openPool();
+
+ // start a transaction
+ TXN *txn = NULL;
+
+ tdbBegin(pEnv, &txn, poolMallocRestricted, poolFree, pPool, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED);
+
+ // generate value payload
+ // char val[((4083 - 4 - 3 - 2) + 1) * 100]; // pSize(4096) - amSize(1) - pageHdr(8) - footerSize(4)
+ char val[32605];
+ int valLen = sizeof(val) / sizeof(val[0]);
+ generateBigVal(val, valLen);
+
+ // insert the generated big data
+ // char const *key = "key1";
+ for (int i = 0; i < 1024 * 4; ++i) {
+ // char const *key = "key123456789";
+ char key[32] = {0};
+ sprintf(key, "key-%d", i);
+ ret = tdbTbInsert(pDb, key, strlen(key) + 1, val, valLen, txn);
+ GTEST_ASSERT_EQ(ret, 0);
+ }
+
+ // commit current transaction
+ tdbCommit(pEnv, txn);
+ tdbPostCommit(pEnv, txn);
+ tdbBegin(pEnv, &txn, poolMallocRestricted, poolFree, pPool, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED);
+
+ for (int i = 1024 * 4; i < 1024 * 8; ++i) {
+ char key[32] = {0};
+ sprintf(key, "key-%d", i);
+ ret = tdbTbInsert(pDb, key, strlen(key) + 1, val, valLen, txn);
+ GTEST_ASSERT_EQ(ret, 0);
+ }
+
+ tdbCommit(pEnv, txn);
+ tdbPostCommit(pEnv, txn);
+
+ closePool(pPool);
+
+ // Close a database
+ tdbTbClose(pDb);
+
+ // Close Env
+ tdbClose(pEnv);
+}
+
+// TEST(TdbPageFlushTest, DISABLED_TbRestoreTest3) {
+TEST(TdbPageFlushTest, TbRestoreTest3) {
+ clearDb("tdb");
+
+ int ret = 0;
+
+ // open Env
+ int const pageSize = 4096;
+ int const pageNum = 64;
+ TDB *pEnv = openEnv("tdb", pageSize, pageNum);
+ GTEST_ASSERT_NE(pEnv, nullptr);
+
+ // open db
+ TTB *pDb = NULL;
+ tdb_cmpr_fn_t compFunc = tKeyCmpr;
+ // ret = tdbTbOpen("ofp_insert.db", -1, -1, compFunc, pEnv, &pDb, 0);
+ ret = tdbTbOpen("ofp_insert.db", -1, -1, compFunc, pEnv, &pDb, 0);
+ GTEST_ASSERT_EQ(ret, 0);
+
+ // open the pool
+ SPoolMem *pPool = openPool();
+
+ // start a transaction
+ TXN *txn = NULL;
+
+ tdbBegin(pEnv, &txn, poolMallocRestricted, poolFree, pPool, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED);
+
+ // generate value payload
+ // char val[((4083 - 4 - 3 - 2) + 1) * 100]; // pSize(4096) - amSize(1) - pageHdr(8) - footerSize(4)
+ char val[32605];
+ int valLen = sizeof(val) / sizeof(val[0]);
+ generateBigVal(val, valLen);
+
+ // insert the generated big data
+ // char const *key = "key1";
+ for (int i = 0; i < 1024 * 4; ++i) {
+ // char const *key = "key123456789";
+ char key[32] = {0};
+ sprintf(key, "key-%d", i);
+ ret = tdbTbInsert(pDb, key, strlen(key) + 1, val, valLen, txn);
+ GTEST_ASSERT_EQ(ret, 0);
+ }
+
+ // commit current transaction
+ tdbAbort(pEnv, txn);
+
+ tdbBegin(pEnv, &txn, poolMallocRestricted, poolFree, pPool, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED);
+
+ for (int i = 1024 * 4; i < 1024 * 8; ++i) {
+ char key[32] = {0};
+ sprintf(key, "key-%d", i);
+ ret = tdbTbInsert(pDb, key, strlen(key) + 1, val, valLen, txn);
+ GTEST_ASSERT_EQ(ret, 0);
+ }
+
+ tdbCommit(pEnv, txn);
+ tdbPostCommit(pEnv, txn);
+
+ closePool(pPool);
+
+ // Close a database
+ tdbTbClose(pDb);
+
+ // Close Env
+ tdbClose(pEnv);
+}
+
+// TEST(TdbPageFlushTest, DISABLED_TbRestoreTest4) {
+TEST(TdbPageFlushTest, TbRestoreTest4) {
+ clearDb("tdb");
+
+ int ret = 0;
+
+ // open Env
+ int const pageSize = 4096;
+ int const pageNum = 64;
+ TDB *pEnv = openEnv("tdb", pageSize, pageNum);
+ GTEST_ASSERT_NE(pEnv, nullptr);
+
+ // open db
+ TTB *pDb = NULL;
+ tdb_cmpr_fn_t compFunc = tKeyCmpr;
+ // ret = tdbTbOpen("ofp_insert.db", -1, -1, compFunc, pEnv, &pDb, 0);
+ ret = tdbTbOpen("ofp_insert.db", -1, -1, compFunc, pEnv, &pDb, 0);
+ GTEST_ASSERT_EQ(ret, 0);
+
+ // open the pool
+ SPoolMem *pPool = openPool();
+
+ // start a transaction
+ TXN *txn = NULL;
+
+ tdbBegin(pEnv, &txn, poolMallocRestricted, poolFree, pPool, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED);
+
+ // generate value payload
+ // char val[((4083 - 4 - 3 - 2) + 1) * 100]; // pSize(4096) - amSize(1) - pageHdr(8) - footerSize(4)
+ char val[32605];
+ int valLen = sizeof(val) / sizeof(val[0]);
+ generateBigVal(val, valLen);
+
+ // insert the generated big data
+ // char const *key = "key1";
+ for (int i = 0; i < 1024 * 4; ++i) {
+ // char const *key = "key123456789";
+ char key[32] = {0};
+ sprintf(key, "key-%d", i);
+ ret = tdbTbInsert(pDb, key, strlen(key) + 1, val, valLen, txn);
+ GTEST_ASSERT_EQ(ret, 0);
+ }
+
+ // commit current transaction
+ tdbAbort(pEnv, txn);
+ closePool(pPool);
+ tdbTbClose(pDb);
+ tdbClose(pEnv);
+
+ pEnv = openEnv("tdb", pageSize, pageNum);
+ GTEST_ASSERT_NE(pEnv, nullptr);
+
+ ret = tdbTbOpen("ofp_insert.db", -1, -1, compFunc, pEnv, &pDb, 0);
+ GTEST_ASSERT_EQ(ret, 0);
+
+ pPool = openPool();
+ tdbBegin(pEnv, &txn, poolMallocRestricted, poolFree, pPool, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED);
+
+ for (int i = 1024 * 4; i < 1024 * 8; ++i) {
+ char key[32] = {0};
+ sprintf(key, "key-%d", i);
+ ret = tdbTbInsert(pDb, key, strlen(key) + 1, val, valLen, txn);
+ GTEST_ASSERT_EQ(ret, 0);
+ }
+
+ tdbCommit(pEnv, txn);
+ tdbPostCommit(pEnv, txn);
+
+ closePool(pPool);
+
+ // Close a database
+ tdbTbClose(pDb);
+
+ // Close Env
+ tdbClose(pEnv);
+}
+
+// TEST(TdbPageFlushTest, DISABLED_TbRestoreTest5) {
+TEST(TdbPageFlushTest, TbRestoreTest5) {
+ clearDb("tdb");
+
+ int ret = 0;
+
+ // open Env
+ int const pageSize = 4096;
+ int const pageNum = 64;
+ TDB *pEnv = openEnv("tdb", pageSize, pageNum);
+ GTEST_ASSERT_NE(pEnv, nullptr);
+
+ // open db
+ TTB *pDb = NULL;
+ tdb_cmpr_fn_t compFunc = tKeyCmpr;
+ // ret = tdbTbOpen("ofp_insert.db", -1, -1, compFunc, pEnv, &pDb, 0);
+ ret = tdbTbOpen("ofp_insert.db", -1, -1, compFunc, pEnv, &pDb, 0);
+ GTEST_ASSERT_EQ(ret, 0);
+
+ // open the pool
+ SPoolMem *pPool = openPool();
+
+ // start a transaction
+ TXN *txn = NULL;
+
+ tdbBegin(pEnv, &txn, poolMallocRestricted, poolFree, pPool, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED);
+
+ // generate value payload
+ // char val[((4083 - 4 - 3 - 2) + 1) * 100]; // pSize(4096) - amSize(1) - pageHdr(8) - footerSize(4)
+ char val[32605];
+ int valLen = sizeof(val) / sizeof(val[0]);
+ generateBigVal(val, valLen);
+
+ // insert the generated big data
+ // char const *key = "key1";
+ for (int i = 0; i < 1024 * 4; ++i) {
+ // char const *key = "key123456789";
+ char key[32] = {0};
+ sprintf(key, "key-%d", i);
+ ret = tdbTbInsert(pDb, key, strlen(key) + 1, val, valLen, txn);
+ GTEST_ASSERT_EQ(ret, 0);
+ }
+
+ // commit current transaction
+ tdbCommit(pEnv, txn);
+ tdbPostCommit(pEnv, txn);
+ closePool(pPool);
+ tdbTbClose(pDb);
+ tdbClose(pEnv);
+
+ pEnv = openEnv("tdb", pageSize, pageNum);
+ GTEST_ASSERT_NE(pEnv, nullptr);
+
+ ret = tdbTbOpen("ofp_insert.db", -1, -1, compFunc, pEnv, &pDb, 0);
+ GTEST_ASSERT_EQ(ret, 0);
+
+ pPool = openPool();
+ tdbBegin(pEnv, &txn, poolMallocRestricted, poolFree, pPool, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED);
+
+ for (int i = 1024 * 4; i < 1024 * 8; ++i) {
+ char key[32] = {0};
+ sprintf(key, "key-%d", i);
+ ret = tdbTbInsert(pDb, key, strlen(key) + 1, val, valLen, txn);
+ GTEST_ASSERT_EQ(ret, 0);
+ }
+
+ tdbCommit(pEnv, txn);
+ tdbPostCommit(pEnv, txn);
+
+ closePool(pPool);
+
+ // Close a database
+ tdbTbClose(pDb);
+
+ // Close Env
+ tdbClose(pEnv);
+}
diff --git a/source/util/src/mpChunk.c b/source/util/src/mpChunk.c
index 2c1c415c04..c7bdcd809f 100755
--- a/source/util/src/mpChunk.c
+++ b/source/util/src/mpChunk.c
@@ -190,6 +190,8 @@ int32_t mpChunkNSAllocMem(SMemPool* pPool, SMPSession* pSession, int64_t size, u
void* pRes = NULL;
int64_t totalSize = size + sizeof(SMPMemHeader) + sizeof(SMPMemTailer) + alignment;
+
+
MP_ERR_JRET(mpChunkNewNS(pPool, &pChunk, totalSize));
SMPMemHeader* pHeader = (SMPMemHeader*)pChunk->pMemStart;
MP_INIT_MEM_HEADER(pHeader, size, false);
diff --git a/tests/army/cluster/arbitrator_election.py b/tests/army/cluster/arbitrator_election.py
new file mode 100644
index 0000000000..7883e162a7
--- /dev/null
+++ b/tests/army/cluster/arbitrator_election.py
@@ -0,0 +1,97 @@
+import taos
+import sys
+import os
+import subprocess
+import glob
+import shutil
+import time
+
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.srvCtl import *
+from frame.caseBase import *
+from frame import *
+from frame.autogen import *
+from frame import epath
+# from frame.server.dnodes import *
+# from frame.server.cluster import *
+
+
+class TDTestCase(TBase):
+
+ def init(self, conn, logSql, replicaVar=1):
+ updatecfgDict = {'dDebugFlag':131}
+ super(TDTestCase, self).init(conn, logSql, replicaVar=1, checkColName="c1")
+
+ self.valgrind = 0
+ self.db = "test"
+ self.stb = "meters"
+ self.childtable_count = 10
+ tdSql.init(conn.cursor(), logSql)
+
+ def run(self):
+ tdSql.execute('CREATE DATABASE db vgroups 1 replica 2;')
+
+ time.sleep(1)
+
+ tdSql.execute("use db;")
+
+ tdSql.execute("CREATE STABLE meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int);")
+
+ tdSql.execute("CREATE TABLE d0 USING meters TAGS (\"California.SanFrancisco\", 2);");
+
+ count = 0
+
+ while count < 100:
+ tdSql.query("show arbgroups;")
+
+ if tdSql.getData(0, 4) == True:
+ break
+
+ tdLog.info("wait %d seconds for is sync"%count)
+ time.sleep(1)
+
+ count += 1
+
+ if count == 100:
+ tdLog.exit("arbgroup sync failed")
+ return
+
+
+ tdSql.query("show db.vgroups;")
+
+ if(tdSql.getData(0, 4) == "follower") and (tdSql.getData(0, 7) == "leader"):
+ tdLog.info("stop dnode2")
+ sc.dnodeStop(2)
+
+ if(tdSql.getData(0, 7) == "follower") and (tdSql.getData(0, 4) == "leader"):
+ tdLog.info("stop dnode 3")
+ sc.dnodeStop(3)
+
+
+ count = 0
+ while count < 11:
+ tdSql.query("show db.vgroups;")
+
+ if(tdSql.getData(0, 4) == "assigned ") or (tdSql.getData(0, 7) == "assigned "):
+ break
+
+ tdLog.info("wait %d seconds for set assigned"%count)
+ time.sleep(1)
+
+ count += 1
+
+ if count == 11:
+ tdLog.exit("check assigned failed")
+ return
+
+
+
+ def stop(self):
+ tdSql.close()
+ tdLog.success(f"{__file__} successfully executed")
+
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())
diff --git a/tests/army/frame/caseBase.py b/tests/army/frame/caseBase.py
index 4427ddcea5..98007c6d8d 100644
--- a/tests/army/frame/caseBase.py
+++ b/tests/army/frame/caseBase.py
@@ -19,6 +19,7 @@ import random
import copy
import json
+import frame.eos
import frame.etool
import frame.eutil
from frame.log import *
@@ -427,6 +428,42 @@ class TBase:
return db, stb, child_count, insert_rows
+ # insert & check
+ def benchInsert(self, jsonFile, options = "", results = None):
+ # exe insert
+ benchmark = frame.etool.benchMarkFile()
+ cmd = f"{benchmark} {options} -f {jsonFile}"
+ rlist = frame.eos.runRetList(cmd, True, True, True)
+ if results != None:
+ for result in results:
+ self.checkListString(rlist, result)
+
+ # open json
+ with open(jsonFile, "r") as file:
+ data = json.load(file)
+
+ # read json
+ dbs = data["databases"]
+ for db in dbs:
+ dbName = db["dbinfo"]["name"]
+ stbs = db["super_tables"]
+ for stb in stbs:
+ stbName = stb["name"]
+ child_count = stb["childtable_count"]
+ insert_rows = stb["insert_rows"]
+ timestamp_step = stb["timestamp_step"]
+
+ # check result
+
+ # count
+ sql = f"select count(*) from {dbName}.{stbName}"
+ tdSql.checkAgg(sql, child_count * insert_rows)
+ # diff
+ sql = f"select * from (select diff(ts) as dif from {dbName}.{stbName} partition by tbname) where dif != {timestamp_step};"
+ tdSql.query(sql)
+ tdSql.checkRows(0)
+ # show
+ tdLog.info(f"insert check passed. db:{dbName} stb:{stbName} child_count:{child_count} insert_rows:{insert_rows}\n")
# tmq
def tmqBenchJson(self, jsonFile, options="", checkStep=False):
diff --git a/tests/army/query/function/ans/ascii.csv b/tests/army/query/function/ans/ascii.csv
index 8d186f63e3..0e67acc9d1 100644
--- a/tests/army/query/function/ans/ascii.csv
+++ b/tests/army/query/function/ans/ascii.csv
@@ -51,7 +51,7 @@ taos> select ASCII('hello') + 1 from ts_4893.meters limit 1
taos> select ASCII('hello') + ASCII('hello') from ts_4893.meters limit 1
ascii('hello') + ascii('hello') |
==================================
- 2.080000000000000e+02 |
+ 208 |
taos> select ASCII(nch1) from ts_4893.meters order by ts limit 5
ascii(nch1) |
diff --git a/tests/army/query/function/ans/char_length.csv b/tests/army/query/function/ans/char_length.csv
index 4b79a42bfa..a8352357cf 100644
--- a/tests/army/query/function/ans/char_length.csv
+++ b/tests/army/query/function/ans/char_length.csv
@@ -51,7 +51,7 @@ taos> select CHAR_LENGTH('hello') + 1 from ts_4893.meters limit 1
taos> select CHAR_LENGTH('hello') + CHAR_LENGTH('hello') from ts_4893.meters limit 1
char_length('hello') + char_length('hello') |
==============================================
- 1.000000000000000e+01 |
+ 10 |
taos> select CHAR_LENGTH(nch1) from ts_4893.meters order by ts limit 5
char_length(nch1) |
diff --git a/tests/army/query/function/ans/greatest.csv b/tests/army/query/function/ans/greatest.csv
new file mode 100644
index 0000000000..b6854a95d6
--- /dev/null
+++ b/tests/army/query/function/ans/greatest.csv
@@ -0,0 +1,1409 @@
+
+taos> alter local 'compareAsStrInGreatest' '1';
+
+taos> select GREATEST(1,2,3,4,5,6,7,8,9,10);
+ greatest(1,2,3,4,5,6,7,8,9,10) |
+=================================
+ 10 |
+
+taos> select GREATEST(1,1.1,2.23,3.4444,5.66666666,6.21241241,7.999999999999);
+ greatest(1,1.1,2.23,3.4444,5.66666666,6.21241241,7.999999999999) |
+===================================================================
+ 7.999999999999 |
+
+taos> select GREATEST(1,'2',3.3,4.4,5);
+ greatest(1,'2',3.3,4.4,5) |
+============================
+ 5 |
+
+taos> select GREATEST(121,'18');
+ greatest(121,'18') |
+============================
+ 18 |
+
+taos> select GREATEST(18888,'18');
+ greatest(18888,'18') |
+============================
+ 18888 |
+
+taos> select GREATEST(1,2,3,4,5,'5.1');
+ greatest(1,2,3,4,5,'5.1') |
+============================
+ 5.1 |
+
+taos> select GREATEST('1','2','3','4',5);
+ greatest('1','2','3','4',5) |
+==============================
+ 5 |
+
+taos> select GREATEST('1','2','3','4','5');
+ greatest('1','2','3','4','5') |
+================================
+ 5 |
+
+taos> select GREATEST(1,2,3,4,5,6,7,'a','b','一','二','三');
+ greatest(1,2,3,4,5,6,7,'a','b','一','二','三') |
+====================================================
+ 二 |
+
+taos> select GREATEST(1,2,3,4,5,6,7,'a','b','c','1','2','1231213');
+ greatest(1,2,3,4,5,6,7,'a','b','c','1','2','1231213') |
+========================================================
+ c |
+
+taos> select GREATEST(1,2,3,4,5,6,7,'a','b','c','1','2','1231213','1231213.123123');
+ greatest(1,2,3,4,5,6,7,'a','b','c','1','2','1231213','1231213.12 |
+===================================================================
+ c |
+
+taos> select GREATEST(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), cast(3 as int), cast(4 as bigint), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)));
+ greatest(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint |
+===================================================================
+ 9 |
+
+taos> select GREATEST(cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as smallint unsigned), cast(3 as int unsigned), cast(4 as bigint unsigned), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)));
+ greatest(cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as |
+===================================================================
+ 9 |
+
+taos> select GREATEST(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), cast(3 as int), cast(4 as bigint), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)), cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as smallint unsigned), cast(3 as int unsigned), cast(4 as bigint unsigned), cast(5 as float), cast(6 as double));
+ greatest(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint |
+===================================================================
+ 9 |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as tinyint));
+ greatest(cast(100 as tinyint), cast(101 as tinyint)) |
+=======================================================
+ 101 |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as smallint));
+ greatest(cast(100 as tinyint), cast(101 as smallint)) |
+========================================================
+ 101 |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as int));
+ greatest(cast(100 as tinyint), cast(101 as int)) |
+===================================================
+ 101 |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as bigint));
+ greatest(cast(100 as tinyint), cast(101 as bigint)) |
+======================================================
+ 101 |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as float));
+ greatest(cast(100 as tinyint), cast(101 as float)) |
+=====================================================
+ 101 |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as double));
+ greatest(cast(100 as tinyint), cast(101 as double)) |
+======================================================
+ 101 |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as varchar(20)));
+ greatest(cast(100 as tinyint), cast(101 as varchar(20))) |
+===========================================================
+ 101 |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as nchar(20)));
+ greatest(cast(100 as tinyint), cast(101 as nchar(20))) |
+=========================================================
+ 101 |
+
+taos> select GREATEST(cast(101 as tinyint), cast(100 as tinyint));
+ greatest(cast(101 as tinyint), cast(100 as tinyint)) |
+=======================================================
+ 101 |
+
+taos> select GREATEST(cast(101 as tinyint), cast(100 as smallint));
+ greatest(cast(101 as tinyint), cast(100 as smallint)) |
+========================================================
+ 101 |
+
+taos> select GREATEST(cast(101 as tinyint), cast(100 as int));
+ greatest(cast(101 as tinyint), cast(100 as int)) |
+===================================================
+ 101 |
+
+taos> select GREATEST(cast(101 as tinyint), cast(100 as bigint));
+ greatest(cast(101 as tinyint), cast(100 as bigint)) |
+======================================================
+ 101 |
+
+taos> select GREATEST(cast(101 as tinyint), cast(100 as float));
+ greatest(cast(101 as tinyint), cast(100 as float)) |
+=====================================================
+ 101 |
+
+taos> select GREATEST(cast(101 as tinyint), cast(100 as double));
+ greatest(cast(101 as tinyint), cast(100 as double)) |
+======================================================
+ 101 |
+
+taos> select GREATEST(cast(101 as tinyint), cast(100 as varchar(20)));
+ greatest(cast(101 as tinyint), cast(100 as varchar(20))) |
+===========================================================
+ 101 |
+
+taos> select GREATEST(cast(101 as tinyint), cast(100 as nchar(20)));
+ greatest(cast(101 as tinyint), cast(100 as nchar(20))) |
+=========================================================
+ 101 |
+
+taos> select GREATEST(cast(1000 as smallint), cast(1001 as smallint));
+ greatest(cast(1000 as smallint), cast(1001 as smallint)) |
+===========================================================
+ 1001 |
+
+taos> select GREATEST(cast(1000 as smallint), cast(1001 as int));
+ greatest(cast(1000 as smallint), cast(1001 as int)) |
+======================================================
+ 1001 |
+
+taos> select GREATEST(cast(1000 as smallint), cast(1001 as bigint));
+ greatest(cast(1000 as smallint), cast(1001 as bigint)) |
+=========================================================
+ 1001 |
+
+taos> select GREATEST(cast(1000 as smallint), cast(1001 as float));
+ greatest(cast(1000 as smallint), cast(1001 as float)) |
+========================================================
+ 1001 |
+
+taos> select GREATEST(cast(1000 as smallint), cast(1001 as double));
+ greatest(cast(1000 as smallint), cast(1001 as double)) |
+=========================================================
+ 1001 |
+
+taos> select GREATEST(cast(1000 as smallint), cast(1001 as varchar(20)));
+ greatest(cast(1000 as smallint), cast(1001 as varchar(20))) |
+==============================================================
+ 1001 |
+
+taos> select GREATEST(cast(1000 as smallint), cast(1001 as nchar(20)));
+ greatest(cast(1000 as smallint), cast(1001 as nchar(20))) |
+============================================================
+ 1001 |
+
+taos> select GREATEST(cast(1001 as smallint), cast(1000 as smallint));
+ greatest(cast(1001 as smallint), cast(1000 as smallint)) |
+===========================================================
+ 1001 |
+
+taos> select GREATEST(cast(1001 as smallint), cast(1000 as int));
+ greatest(cast(1001 as smallint), cast(1000 as int)) |
+======================================================
+ 1001 |
+
+taos> select GREATEST(cast(1001 as smallint), cast(1000 as bigint));
+ greatest(cast(1001 as smallint), cast(1000 as bigint)) |
+=========================================================
+ 1001 |
+
+taos> select GREATEST(cast(1001 as smallint), cast(1000 as float));
+ greatest(cast(1001 as smallint), cast(1000 as float)) |
+========================================================
+ 1001 |
+
+taos> select GREATEST(cast(1001 as smallint), cast(1000 as double));
+ greatest(cast(1001 as smallint), cast(1000 as double)) |
+=========================================================
+ 1001 |
+
+taos> select GREATEST(cast(1001 as smallint), cast(1000 as varchar(20)));
+ greatest(cast(1001 as smallint), cast(1000 as varchar(20))) |
+==============================================================
+ 1001 |
+
+taos> select GREATEST(cast(1001 as smallint), cast(1000 as nchar(20)));
+ greatest(cast(1001 as smallint), cast(1000 as nchar(20))) |
+============================================================
+ 1001 |
+
+taos> select GREATEST(cast(1000000 as int), cast(1000001 as int));
+ greatest(cast(1000000 as int), cast(1000001 as int)) |
+=======================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000000 as int), cast(1000001 as bigint));
+ greatest(cast(1000000 as int), cast(1000001 as bigint)) |
+==========================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000000 as int), cast(1000001 as float));
+ greatest(cast(1000000 as int), cast(1000001 as float)) |
+=========================================================
+ 1e+06 |
+
+taos> select GREATEST(cast(1000000 as int), cast(1000001 as double));
+ greatest(cast(1000000 as int), cast(1000001 as double)) |
+==========================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000000 as int), cast(1000001 as varchar(20)));
+ greatest(cast(1000000 as int), cast(1000001 as varchar(20))) |
+===============================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000000 as int), cast(1000001 as nchar(20)));
+ greatest(cast(1000000 as int), cast(1000001 as nchar(20))) |
+=============================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000001 as int), cast(1000000 as int));
+ greatest(cast(1000001 as int), cast(1000000 as int)) |
+=======================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000001 as int), cast(1000000 as bigint));
+ greatest(cast(1000001 as int), cast(1000000 as bigint)) |
+==========================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000001 as int), cast(1000000 as float));
+ greatest(cast(1000001 as int), cast(1000000 as float)) |
+=========================================================
+ 1e+06 |
+
+taos> select GREATEST(cast(1000001 as int), cast(1000000 as double));
+ greatest(cast(1000001 as int), cast(1000000 as double)) |
+==========================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000001 as int), cast(1000000 as varchar(20)));
+ greatest(cast(1000001 as int), cast(1000000 as varchar(20))) |
+===============================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000001 as int), cast(1000000 as nchar(20)));
+ greatest(cast(1000001 as int), cast(1000000 as nchar(20))) |
+=============================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000000000 as bigint), cast(1000000001 as bigint));
+ greatest(cast(1000000000 as bigint), cast(1000000001 as bigint)) |
+===================================================================
+ 1000000001 |
+
+taos> select GREATEST(cast(1000000000 as bigint), cast(1000000001 as float));
+ greatest(cast(1000000000 as bigint), cast(1000000001 as float)) |
+==================================================================
+ 1e+09 |
+
+taos> select GREATEST(cast(1000000000 as bigint), cast(1000000001 as double));
+ greatest(cast(1000000000 as bigint), cast(1000000001 as double)) |
+===================================================================
+ 1000000001 |
+
+taos> select GREATEST(cast(1000000000 as bigint), cast(1000000001 as varchar(20)));
+ greatest(cast(1000000000 as bigint), cast(1000000001 as varchar( |
+===================================================================
+ 1000000001 |
+
+taos> select GREATEST(cast(1000000000 as bigint), cast(1000000001 as nchar(20)));
+ greatest(cast(1000000000 as bigint), cast(1000000001 as nchar(20 |
+===================================================================
+ 1000000001 |
+
+taos> select GREATEST(cast(1000000001 as bigint), cast(1000000000 as bigint));
+ greatest(cast(1000000001 as bigint), cast(1000000000 as bigint)) |
+===================================================================
+ 1000000001 |
+
+taos> select GREATEST(cast(1000000001 as bigint), cast(1000000000 as float));
+ greatest(cast(1000000001 as bigint), cast(1000000000 as float)) |
+==================================================================
+ 1e+09 |
+
+taos> select GREATEST(cast(1000000001 as bigint), cast(1000000000 as double));
+ greatest(cast(1000000001 as bigint), cast(1000000000 as double)) |
+===================================================================
+ 1000000001 |
+
+taos> select GREATEST(cast(1000000001 as bigint), cast(1000000000 as varchar(20)));
+ greatest(cast(1000000001 as bigint), cast(1000000000 as varchar( |
+===================================================================
+ 1000000001 |
+
+taos> select GREATEST(cast(1000000001 as bigint), cast(1000000000 as nchar(20)));
+ greatest(cast(1000000001 as bigint), cast(1000000000 as nchar(20 |
+===================================================================
+ 1000000001 |
+
+taos> select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as float));
+ greatest(cast(100000.1111111 as float), cast(100001.1111111 as f |
+===================================================================
+ 100001 |
+
+taos> select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as double));
+ greatest(cast(100000.1111111 as float), cast(100001.1111111 as d |
+===================================================================
+ 100001.1111111 |
+
+taos> select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as timestamp));
+ greatest(cast(100000.1111111 as float), cast(100001.1111111 as t |
+===================================================================
+ 100001 |
+
+taos> select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as varchar(20)));
+ greatest(cast(100000.1111111 as float), cast(100001.1111111 as v |
+===================================================================
+ 100001.1111111 |
+
+taos> select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as nchar(20)));
+ greatest(cast(100000.1111111 as float), cast(100001.1111111 as n |
+===================================================================
+ 100001.1111111 |
+
+taos> select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as float));
+ greatest(cast(100001.1111111 as float), cast(100000.1111111 as f |
+===================================================================
+ 100001 |
+
+taos> select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as double));
+ greatest(cast(100001.1111111 as float), cast(100000.1111111 as d |
+===================================================================
+ 100001.109375 |
+
+taos> select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as timestamp));
+ greatest(cast(100001.1111111 as float), cast(100000.1111111 as t |
+===================================================================
+ 100001 |
+
+taos> select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as varchar(20)));
+ greatest(cast(100001.1111111 as float), cast(100000.1111111 as v |
+===================================================================
+ 100001.109375 |
+
+taos> select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as nchar(20)));
+ greatest(cast(100001.1111111 as float), cast(100000.1111111 as n |
+===================================================================
+ 100001.109375 |
+
+taos> select GREATEST(cast(100000.1111111 as double), cast(100001.1111111 as double));
+ greatest(cast(100000.1111111 as double), cast(100001.1111111 as |
+===================================================================
+ 100001.1111111 |
+
+taos> select GREATEST(cast(100000.1111111 as double), cast(100001.1111111 as timestamp));
+ greatest(cast(100000.1111111 as double), cast(100001.1111111 as |
+===================================================================
+ 100001 |
+
+taos> select GREATEST(cast(100000.1111111 as double), cast(100001.1111111 as varchar(20)));
+ greatest(cast(100000.1111111 as double), cast(100001.1111111 as |
+===================================================================
+ 100001.1111111 |
+
+taos> select GREATEST(cast(100000.1111111 as double), cast(100001.1111111 as nchar(20)));
+ greatest(cast(100000.1111111 as double), cast(100001.1111111 as |
+===================================================================
+ 100001.1111111 |
+
+taos> select GREATEST(cast(100001.1111111 as double), cast(100000.1111111 as double));
+ greatest(cast(100001.1111111 as double), cast(100000.1111111 as |
+===================================================================
+ 100001.1111111 |
+
+taos> select GREATEST(cast(100001.1111111 as double), cast(100000.1111111 as timestamp));
+ greatest(cast(100001.1111111 as double), cast(100000.1111111 as |
+===================================================================
+ 100001.1111111 |
+
+taos> select GREATEST(cast(100001.1111111 as double), cast(100000.1111111 as varchar(20)));
+ greatest(cast(100001.1111111 as double), cast(100000.1111111 as |
+===================================================================
+ 100001.111111 |
+
+taos> select GREATEST(cast(100001.1111111 as double), cast(100000.1111111 as nchar(20)));
+ greatest(cast(100001.1111111 as double), cast(100000.1111111 as |
+===================================================================
+ 100001.111111 |
+
+taos> select GREATEST(cast('中文测试' as varchar(20)), cast('中文测试一' as varchar(20)));
+ greatest(cast('中文测试' as varchar(20)), cast('中文测试 |
+===================================================================
+ 中文测试一 |
+
+taos> select GREATEST(cast('中文测试' as varchar(20)), cast('中文测试一' as nchar(20)));
+ greatest(cast('中文测试' as varchar(20)), cast('中文测试 |
+===================================================================
+ 中文测试一 |
+
+taos> select GREATEST(cast('中文测试一' as varchar(20)), cast('中文测试' as varchar(20)));
+ greatest(cast('中文测试一' as varchar(20)), cast('中文测 |
+===================================================================
+ 中文测试一 |
+
+taos> select GREATEST(cast('中文测试一' as varchar(20)), cast('中文测试' as nchar(20)));
+ greatest(cast('中文测试一' as varchar(20)), cast('中文测 |
+===================================================================
+ 中文测试一 |
+
+taos> select GREATEST(cast('abc123abc' as varchar(20)), cast('abc124abc' as varchar(20)));
+ greatest(cast('abc123abc' as varchar(20)), cast('abc124abc' as v |
+===================================================================
+ abc124abc |
+
+taos> select GREATEST(cast('abc123abc' as varchar(20)), cast('abc124abc' as nchar(20)));
+ greatest(cast('abc123abc' as varchar(20)), cast('abc124abc' as n |
+===================================================================
+ abc124abc |
+
+taos> select GREATEST(cast('abc124abc' as varchar(20)), cast('abc123abc' as varchar(20)));
+ greatest(cast('abc124abc' as varchar(20)), cast('abc123abc' as v |
+===================================================================
+ abc124abc |
+
+taos> select GREATEST(cast('abc124abc' as varchar(20)), cast('abc123abc' as nchar(20)));
+ greatest(cast('abc124abc' as varchar(20)), cast('abc123abc' as n |
+===================================================================
+ abc124abc |
+
+taos> select GREATEST(cast('abc123abc' as nchar(20)), cast('abc124abc' as nchar(20)));
+ greatest(cast('abc123abc' as nchar(20)), cast('abc124abc' as nch |
+===================================================================
+ abc124abc |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as float), cast(102 as varchar(20)));
+ greatest(cast(100 as tinyint), cast(101 as float), cast(102 as v |
+===================================================================
+ 102 |
+
+taos> select GREATEST(cast(100 as float), cast(101 as tinyint), cast(102 as varchar(20)));
+ greatest(cast(100 as float), cast(101 as tinyint), cast(102 as v |
+===================================================================
+ 102 |
+
+taos> select GREATEST(cast(100 as float), cast(101 as varchar(20)), cast(102 as tinyint));
+ greatest(cast(100 as float), cast(101 as varchar(20)), cast(102 |
+===================================================================
+ 102 |
+
+taos> select GREATEST(cast(100 as varchar(20)), cast(101 as float), cast(102 as tinyint));
+ greatest(cast(100 as varchar(20)), cast(101 as float), cast(102 |
+===================================================================
+ 102 |
+
+taos> select GREATEST('a','b','c','d','e','f','g','h','1231','15155');
+ greatest('a','b','c','d','e','f','g','h','1231','15155') |
+===========================================================
+ h |
+
+taos> select GREATEST(current, voltage, phase, id, nch1, nch2, var1, var2) from ts_4893.meters order by ts limit 10;
+ greatest(current, voltage, phase, id, nch1, nch2, var1, var2) |
+================================================================
+ 四 |
+ 三a |
+ 四 |
+ 一 |
+ 一二三四五六七八九十 |
+ 一二三 |
+ prision |
+ 一二三四五六七八九十 |
+ prision |
+ 一 |
+
+taos> select GREATEST(current, voltage, phase, id) from ts_4893.meters order by ts limit 10;
+ greatest(current, voltage, phase, id) |
+========================================
+ 221 |
+ 220 |
+ 215 |
+ 216 |
+ 219 |
+ 221 |
+ 215 |
+ 217 |
+ 216 |
+ 223 |
+
+taos> select GREATEST(nch1, nch2, var1, var2) from ts_4893.meters order by ts limit 10;
+ greatest(nch1, nch2, var1, var2) |
+===================================
+ 四 |
+ 三a |
+ 四 |
+ 一 |
+ 一二三四五六七八九十 |
+ 一二三 |
+ prision |
+ 一二三四五六七八九十 |
+ prision |
+ 一 |
+
+taos> select GREATEST(221, voltage) from ts_4893.meters order by ts limit 10;
+ greatest(221, voltage) |
+=========================
+ 221 |
+ 221 |
+ 221 |
+ 221 |
+ 221 |
+ 221 |
+ 221 |
+ 221 |
+ 221 |
+ 223 |
+
+taos> select GREATEST(5, id) from ts_4893.meters order by ts limit 10;
+ greatest(5, id) |
+========================
+ 5 |
+ 5 |
+ 5 |
+ 5 |
+ 5 |
+ 5 |
+ 6 |
+ 7 |
+ 8 |
+ 9 |
+
+taos> select GREATEST('r', nch1) from ts_4893.meters order by ts limit 10;
+ greatest('r', nch1) |
+=================================
+ r |
+ 一二三四五六七八九十 |
+ update |
+ r |
+ r |
+ r |
+ r |
+ 一二三四五六七八九十 |
+ r |
+ r |
+
+taos> select GREATEST('r', nch1, nch2) from ts_4893.meters order by ts limit 10;
+ greatest('r', nch1, nch2) |
+=================================
+ 四 |
+ 一二三四五六七八九十 |
+ update |
+ 一 |
+ r |
+ 一二三 |
+ r |
+ 一二三四五六七八九十 |
+ r |
+ r |
+
+taos> select GREATEST('r', var1) from ts_4893.meters order by ts limit 10;
+ greatest('r', var1) |
+=================================
+ r |
+ r |
+ r |
+ r |
+ 一二三四五六七八九十 |
+ update |
+ r |
+ r |
+ r |
+ r |
+
+taos> select GREATEST('r', var1, var2) from ts_4893.meters order by ts limit 10;
+ greatest('r', var1, var2) |
+=================================
+ r |
+ 三a |
+ 四 |
+ r |
+ 一二三四五六七八九十 |
+ update |
+ r |
+ r |
+ r |
+ 一 |
+
+taos> select GREATEST('二中文测试', nch1) from ts_4893.meters order by ts limit 10;
+ greatest('二中文测试', nch1) |
+====================================
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+
+taos> select GREATEST('二中文测试', nch1, nch2) from ts_4893.meters order by ts limit 10;
+ greatest('二中文测试', nch1, nch2) |
+==========================================
+ 四 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+
+taos> select GREATEST('二中文测试', var1) from ts_4893.meters order by ts limit 10;
+ greatest('二中文测试', var1) |
+====================================
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+
+taos> select GREATEST('二中文测试', var1, var2) from ts_4893.meters order by ts limit 10;
+ greatest('二中文测试', var1, var2) |
+==========================================
+ 二中文测试 |
+ 二中文测试 |
+ 四 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+
+taos> select GREATEST('23', 3443434343434343);
+ greatest('23', 3443434343434343) |
+===================================
+ 3443434343434343 |
+
+taos> select GREATEST(co, 3443434343434343) from ts_4893.n1;
+ greatest(co, 3443434343434343) |
+=================================
+ 3443434343434343 |
+ 3443434343434343 |
+ 3443434343434343 |
+
+taos> select GREATEST('23', 3443434343434343) from ts_4893.n1;
+ greatest('23', 3443434343434343) |
+===================================
+ 3443434343434343 |
+ 3443434343434343 |
+ 3443434343434343 |
+
+taos> select GREATEST('23', 1443434343434343) from ts_4893.n1;
+ greatest('23', 1443434343434343) |
+===================================
+ 23 |
+ 23 |
+ 23 |
+
+taos> select GREATEST(current, voltage) from ts_4893.n1;
+ greatest(current, voltage) |
+=============================
+ NULL |
+ NULL |
+ 5 |
+
+taos> select GREATEST(current, voltage, '15') from ts_4893.n1;
+ greatest(current, voltage, '15') |
+===================================
+ NULL |
+ NULL |
+ 5.000000 |
+
+taos> alter local 'compareAsStrInGreatest' '0';
+
+taos> select GREATEST(1,'2',3.3,4.4,5);
+ greatest(1,'2',3.3,4.4,5) |
+============================
+ 5 |
+
+taos> select GREATEST(1,2,3,4,5,'5.1');
+ greatest(1,2,3,4,5,'5.1') |
+============================
+ 5 |
+
+taos> select GREATEST(121,'18');
+ greatest(121,'18') |
+========================
+ 121 |
+
+taos> select GREATEST('1','2','3','4','5');
+ greatest('1','2','3','4','5') |
+================================
+ 5 |
+
+taos> select GREATEST(1,2,3,4,5,6,7,'a','b','一','二','三');
+ greatest(1,2,3,4,5,6,7,'a','b','一','二','三') |
+====================================================
+ 7 |
+
+taos> select GREATEST(1,2,3,4,5,6,7,'a','b','c','1','2','1231213');
+ greatest(1,2,3,4,5,6,7,'a','b','c','1','2','1231213') |
+========================================================
+ 1231213 |
+
+taos> select GREATEST(1,2,3,4,5,6,7,'a','b','c','1','2','1231213','1231213.123123');
+ greatest(1,2,3,4,5,6,7,'a','b','c','1','2','1231213','1231213.12 |
+===================================================================
+ 1231213 |
+
+taos> select GREATEST(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), cast(3 as int), cast(4 as bigint), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)));
+ greatest(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint |
+===================================================================
+ 9 |
+
+taos> select GREATEST(cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as smallint unsigned), cast(3 as int unsigned), cast(4 as bigint unsigned), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)));
+ greatest(cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as |
+===================================================================
+ 9 |
+
+taos> select GREATEST(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), cast(3 as int), cast(4 as bigint), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)), cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as smallint unsigned), cast(3 as int unsigned), cast(4 as bigint unsigned), cast(5 as float), cast(6 as double));
+ greatest(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint |
+===================================================================
+ 9 |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as tinyint));
+ greatest(cast(100 as tinyint), cast(101 as tinyint)) |
+=======================================================
+ 101 |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as smallint));
+ greatest(cast(100 as tinyint), cast(101 as smallint)) |
+========================================================
+ 101 |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as int));
+ greatest(cast(100 as tinyint), cast(101 as int)) |
+===================================================
+ 101 |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as bigint));
+ greatest(cast(100 as tinyint), cast(101 as bigint)) |
+======================================================
+ 101 |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as float));
+ greatest(cast(100 as tinyint), cast(101 as float)) |
+=====================================================
+ 101 |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as double));
+ greatest(cast(100 as tinyint), cast(101 as double)) |
+======================================================
+ 101 |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as varchar(20)));
+ greatest(cast(100 as tinyint), cast(101 as varchar(20))) |
+===========================================================
+ 101 |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as nchar(20)));
+ greatest(cast(100 as tinyint), cast(101 as nchar(20))) |
+=========================================================
+ 101 |
+
+taos> select GREATEST(cast(101 as tinyint), cast(100 as tinyint));
+ greatest(cast(101 as tinyint), cast(100 as tinyint)) |
+=======================================================
+ 101 |
+
+taos> select GREATEST(cast(101 as tinyint), cast(100 as smallint));
+ greatest(cast(101 as tinyint), cast(100 as smallint)) |
+========================================================
+ 101 |
+
+taos> select GREATEST(cast(101 as tinyint), cast(100 as int));
+ greatest(cast(101 as tinyint), cast(100 as int)) |
+===================================================
+ 101 |
+
+taos> select GREATEST(cast(101 as tinyint), cast(100 as bigint));
+ greatest(cast(101 as tinyint), cast(100 as bigint)) |
+======================================================
+ 101 |
+
+taos> select GREATEST(cast(101 as tinyint), cast(100 as float));
+ greatest(cast(101 as tinyint), cast(100 as float)) |
+=====================================================
+ 101 |
+
+taos> select GREATEST(cast(101 as tinyint), cast(100 as double));
+ greatest(cast(101 as tinyint), cast(100 as double)) |
+======================================================
+ 101 |
+
+taos> select GREATEST(cast(101 as tinyint), cast(100 as varchar(20)));
+ greatest(cast(101 as tinyint), cast(100 as varchar(20))) |
+===========================================================
+ 101 |
+
+taos> select GREATEST(cast(101 as tinyint), cast(100 as nchar(20)));
+ greatest(cast(101 as tinyint), cast(100 as nchar(20))) |
+=========================================================
+ 101 |
+
+taos> select GREATEST(cast(1000 as smallint), cast(1001 as smallint));
+ greatest(cast(1000 as smallint), cast(1001 as smallint)) |
+===========================================================
+ 1001 |
+
+taos> select GREATEST(cast(1000 as smallint), cast(1001 as int));
+ greatest(cast(1000 as smallint), cast(1001 as int)) |
+======================================================
+ 1001 |
+
+taos> select GREATEST(cast(1000 as smallint), cast(1001 as bigint));
+ greatest(cast(1000 as smallint), cast(1001 as bigint)) |
+=========================================================
+ 1001 |
+
+taos> select GREATEST(cast(1000 as smallint), cast(1001 as float));
+ greatest(cast(1000 as smallint), cast(1001 as float)) |
+========================================================
+ 1001 |
+
+taos> select GREATEST(cast(1000 as smallint), cast(1001 as double));
+ greatest(cast(1000 as smallint), cast(1001 as double)) |
+=========================================================
+ 1001 |
+
+taos> select GREATEST(cast(1000 as smallint), cast(1001 as varchar(20)));
+ greatest(cast(1000 as smallint), cast(1001 as varchar(20))) |
+==============================================================
+ 1001 |
+
+taos> select GREATEST(cast(1000 as smallint), cast(1001 as nchar(20)));
+ greatest(cast(1000 as smallint), cast(1001 as nchar(20))) |
+============================================================
+ 1001 |
+
+taos> select GREATEST(cast(1001 as smallint), cast(1000 as smallint));
+ greatest(cast(1001 as smallint), cast(1000 as smallint)) |
+===========================================================
+ 1001 |
+
+taos> select GREATEST(cast(1001 as smallint), cast(1000 as int));
+ greatest(cast(1001 as smallint), cast(1000 as int)) |
+======================================================
+ 1001 |
+
+taos> select GREATEST(cast(1001 as smallint), cast(1000 as bigint));
+ greatest(cast(1001 as smallint), cast(1000 as bigint)) |
+=========================================================
+ 1001 |
+
+taos> select GREATEST(cast(1001 as smallint), cast(1000 as float));
+ greatest(cast(1001 as smallint), cast(1000 as float)) |
+========================================================
+ 1001 |
+
+taos> select GREATEST(cast(1001 as smallint), cast(1000 as double));
+ greatest(cast(1001 as smallint), cast(1000 as double)) |
+=========================================================
+ 1001 |
+
+taos> select GREATEST(cast(1001 as smallint), cast(1000 as varchar(20)));
+ greatest(cast(1001 as smallint), cast(1000 as varchar(20))) |
+==============================================================
+ 1001 |
+
+taos> select GREATEST(cast(1001 as smallint), cast(1000 as nchar(20)));
+ greatest(cast(1001 as smallint), cast(1000 as nchar(20))) |
+============================================================
+ 1001 |
+
+taos> select GREATEST(cast(1000000 as int), cast(1000001 as int));
+ greatest(cast(1000000 as int), cast(1000001 as int)) |
+=======================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000000 as int), cast(1000001 as bigint));
+ greatest(cast(1000000 as int), cast(1000001 as bigint)) |
+==========================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000000 as int), cast(1000001 as float));
+ greatest(cast(1000000 as int), cast(1000001 as float)) |
+=========================================================
+ 1e+06 |
+
+taos> select GREATEST(cast(1000000 as int), cast(1000001 as double));
+ greatest(cast(1000000 as int), cast(1000001 as double)) |
+==========================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000000 as int), cast(1000001 as varchar(20)));
+ greatest(cast(1000000 as int), cast(1000001 as varchar(20))) |
+===============================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000000 as int), cast(1000001 as nchar(20)));
+ greatest(cast(1000000 as int), cast(1000001 as nchar(20))) |
+=============================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000001 as int), cast(1000000 as int));
+ greatest(cast(1000001 as int), cast(1000000 as int)) |
+=======================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000001 as int), cast(1000000 as bigint));
+ greatest(cast(1000001 as int), cast(1000000 as bigint)) |
+==========================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000001 as int), cast(1000000 as float));
+ greatest(cast(1000001 as int), cast(1000000 as float)) |
+=========================================================
+ 1e+06 |
+
+taos> select GREATEST(cast(1000001 as int), cast(1000000 as double));
+ greatest(cast(1000001 as int), cast(1000000 as double)) |
+==========================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000001 as int), cast(1000000 as varchar(20)));
+ greatest(cast(1000001 as int), cast(1000000 as varchar(20))) |
+===============================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000001 as int), cast(1000000 as nchar(20)));
+ greatest(cast(1000001 as int), cast(1000000 as nchar(20))) |
+=============================================================
+ 1000001 |
+
+taos> select GREATEST(cast(1000000000 as bigint), cast(1000000001 as bigint));
+ greatest(cast(1000000000 as bigint), cast(1000000001 as bigint)) |
+===================================================================
+ 1000000001 |
+
+taos> select GREATEST(cast(1000000000 as bigint), cast(1000000001 as float));
+ greatest(cast(1000000000 as bigint), cast(1000000001 as float)) |
+==================================================================
+ 1e+09 |
+
+taos> select GREATEST(cast(1000000000 as bigint), cast(1000000001 as double));
+ greatest(cast(1000000000 as bigint), cast(1000000001 as double)) |
+===================================================================
+ 1000000001 |
+
+taos> select GREATEST(cast(1000000000 as bigint), cast(1000000001 as varchar(20)));
+ greatest(cast(1000000000 as bigint), cast(1000000001 as varchar( |
+===================================================================
+ 1000000001 |
+
+taos> select GREATEST(cast(1000000000 as bigint), cast(1000000001 as nchar(20)));
+ greatest(cast(1000000000 as bigint), cast(1000000001 as nchar(20 |
+===================================================================
+ 1000000001 |
+
+taos> select GREATEST(cast(1000000001 as bigint), cast(1000000000 as bigint));
+ greatest(cast(1000000001 as bigint), cast(1000000000 as bigint)) |
+===================================================================
+ 1000000001 |
+
+taos> select GREATEST(cast(1000000001 as bigint), cast(1000000000 as float));
+ greatest(cast(1000000001 as bigint), cast(1000000000 as float)) |
+==================================================================
+ 1e+09 |
+
+taos> select GREATEST(cast(1000000001 as bigint), cast(1000000000 as double));
+ greatest(cast(1000000001 as bigint), cast(1000000000 as double)) |
+===================================================================
+ 1000000001 |
+
+taos> select GREATEST(cast(1000000001 as bigint), cast(1000000000 as varchar(20)));
+ greatest(cast(1000000001 as bigint), cast(1000000000 as varchar( |
+===================================================================
+ 1000000001 |
+
+taos> select GREATEST(cast(1000000001 as bigint), cast(1000000000 as nchar(20)));
+ greatest(cast(1000000001 as bigint), cast(1000000000 as nchar(20 |
+===================================================================
+ 1000000001 |
+
+taos> select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as float));
+ greatest(cast(100000.1111111 as float), cast(100001.1111111 as f |
+===================================================================
+ 100001 |
+
+taos> select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as double));
+ greatest(cast(100000.1111111 as float), cast(100001.1111111 as d |
+===================================================================
+ 100001.1111111 |
+
+taos> select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as timestamp));
+ greatest(cast(100000.1111111 as float), cast(100001.1111111 as t |
+===================================================================
+ 100001 |
+
+taos> select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as varchar(20)));
+ greatest(cast(100000.1111111 as float), cast(100001.1111111 as v |
+===================================================================
+ 100001 |
+
+taos> select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as nchar(20)));
+ greatest(cast(100000.1111111 as float), cast(100001.1111111 as n |
+===================================================================
+ 100001 |
+
+taos> select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as float));
+ greatest(cast(100001.1111111 as float), cast(100000.1111111 as f |
+===================================================================
+ 100001 |
+
+taos> select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as double));
+ greatest(cast(100001.1111111 as float), cast(100000.1111111 as d |
+===================================================================
+ 100001.109375 |
+
+taos> select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as timestamp));
+ greatest(cast(100001.1111111 as float), cast(100000.1111111 as t |
+===================================================================
+ 100001 |
+
+taos> select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as varchar(20)));
+ greatest(cast(100001.1111111 as float), cast(100000.1111111 as v |
+===================================================================
+ 100001 |
+
+taos> select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as nchar(20)));
+ greatest(cast(100001.1111111 as float), cast(100000.1111111 as n |
+===================================================================
+ 100001 |
+
+taos> select GREATEST(cast(100000.1111111 as double), cast(100001.1111111 as double));
+ greatest(cast(100000.1111111 as double), cast(100001.1111111 as |
+===================================================================
+ 100001.1111111 |
+
+taos> select GREATEST(cast(100000.1111111 as double), cast(100001.1111111 as timestamp));
+ greatest(cast(100000.1111111 as double), cast(100001.1111111 as |
+===================================================================
+ 100001 |
+
+taos> select GREATEST(cast(100000.1111111 as double), cast(100001.1111111 as varchar(20)));
+ greatest(cast(100000.1111111 as double), cast(100001.1111111 as |
+===================================================================
+ 100001.1111111 |
+
+taos> select GREATEST(cast(100000.1111111 as double), cast(100001.1111111 as nchar(20)));
+ greatest(cast(100000.1111111 as double), cast(100001.1111111 as |
+===================================================================
+ 100001.1111111 |
+
+taos> select GREATEST(cast(100001.1111111 as double), cast(100000.1111111 as double));
+ greatest(cast(100001.1111111 as double), cast(100000.1111111 as |
+===================================================================
+ 100001.1111111 |
+
+taos> select GREATEST(cast(100001.1111111 as double), cast(100000.1111111 as timestamp));
+ greatest(cast(100001.1111111 as double), cast(100000.1111111 as |
+===================================================================
+ 100001.1111111 |
+
+taos> select GREATEST(cast(100001.1111111 as double), cast(100000.1111111 as varchar(20)));
+ greatest(cast(100001.1111111 as double), cast(100000.1111111 as |
+===================================================================
+ 100001.1111111 |
+
+taos> select GREATEST(cast(100001.1111111 as double), cast(100000.1111111 as nchar(20)));
+ greatest(cast(100001.1111111 as double), cast(100000.1111111 as |
+===================================================================
+ 100001.1111111 |
+
+taos> select GREATEST(cast('中文测试' as varchar(20)), cast('中文测试一' as varchar(20)));
+ greatest(cast('中文测试' as varchar(20)), cast('中文测试 |
+===================================================================
+ 中文测试一 |
+
+taos> select GREATEST(cast('中文测试' as varchar(20)), cast('中文测试一' as nchar(20)));
+ greatest(cast('中文测试' as varchar(20)), cast('中文测试 |
+===================================================================
+ 中文测试一 |
+
+taos> select GREATEST(cast('中文测试一' as varchar(20)), cast('中文测试' as varchar(20)));
+ greatest(cast('中文测试一' as varchar(20)), cast('中文测 |
+===================================================================
+ 中文测试一 |
+
+taos> select GREATEST(cast('中文测试一' as varchar(20)), cast('中文测试' as nchar(20)));
+ greatest(cast('中文测试一' as varchar(20)), cast('中文测 |
+===================================================================
+ 中文测试一 |
+
+taos> select GREATEST(cast('abc123abc' as varchar(20)), cast('abc124abc' as varchar(20)));
+ greatest(cast('abc123abc' as varchar(20)), cast('abc124abc' as v |
+===================================================================
+ abc124abc |
+
+taos> select GREATEST(cast('abc123abc' as varchar(20)), cast('abc124abc' as nchar(20)));
+ greatest(cast('abc123abc' as varchar(20)), cast('abc124abc' as n |
+===================================================================
+ abc124abc |
+
+taos> select GREATEST(cast('abc124abc' as varchar(20)), cast('abc123abc' as varchar(20)));
+ greatest(cast('abc124abc' as varchar(20)), cast('abc123abc' as v |
+===================================================================
+ abc124abc |
+
+taos> select GREATEST(cast('abc124abc' as varchar(20)), cast('abc123abc' as nchar(20)));
+ greatest(cast('abc124abc' as varchar(20)), cast('abc123abc' as n |
+===================================================================
+ abc124abc |
+
+taos> select GREATEST(cast('abc123abc' as nchar(20)), cast('abc124abc' as nchar(20)));
+ greatest(cast('abc123abc' as nchar(20)), cast('abc124abc' as nch |
+===================================================================
+ abc124abc |
+
+taos> select GREATEST(cast(100 as tinyint), cast(101 as float), cast(102 as varchar(20)));
+ greatest(cast(100 as tinyint), cast(101 as float), cast(102 as v |
+===================================================================
+ 102 |
+
+taos> select GREATEST(cast(100 as float), cast(101 as tinyint), cast(102 as varchar(20)));
+ greatest(cast(100 as float), cast(101 as tinyint), cast(102 as v |
+===================================================================
+ 102 |
+
+taos> select GREATEST(cast(100 as float), cast(101 as varchar(20)), cast(102 as tinyint));
+ greatest(cast(100 as float), cast(101 as varchar(20)), cast(102 |
+===================================================================
+ 102 |
+
+taos> select GREATEST(cast(100 as varchar(20)), cast(101 as float), cast(102 as tinyint));
+ greatest(cast(100 as varchar(20)), cast(101 as float), cast(102 |
+===================================================================
+ 102 |
+
+taos> select GREATEST('a','b','c','d','e','f','g','h','1231','15155');
+ greatest('a','b','c','d','e','f','g','h','1231','15155') |
+===========================================================
+ h |
+
+taos> select GREATEST(current, voltage, phase, id, nch1, nch2, var1, var2) from ts_4893.meters order by ts limit 10;
+ greatest(current, voltage, phase, id, nch1, nch2, var1, var2) |
+================================================================
+ 221 |
+ 220 |
+ 215 |
+ 216 |
+ 219 |
+ 221 |
+ 215 |
+ 217 |
+ 216 |
+ 223 |
+
+taos> select GREATEST(current, voltage, phase, id) from ts_4893.meters order by ts limit 10;
+ greatest(current, voltage, phase, id) |
+========================================
+ 221 |
+ 220 |
+ 215 |
+ 216 |
+ 219 |
+ 221 |
+ 215 |
+ 217 |
+ 216 |
+ 223 |
+
+taos> select GREATEST(nch1, nch2, var1, var2) from ts_4893.meters order by ts limit 10;
+ greatest(nch1, nch2, var1, var2) |
+===================================
+ 四 |
+ 三a |
+ 四 |
+ 一 |
+ 一二三四五六七八九十 |
+ 一二三 |
+ prision |
+ 一二三四五六七八九十 |
+ prision |
+ 一 |
+
+taos> select GREATEST(221, voltage) from ts_4893.meters order by ts limit 10;
+ greatest(221, voltage) |
+=========================
+ 221 |
+ 221 |
+ 221 |
+ 221 |
+ 221 |
+ 221 |
+ 221 |
+ 221 |
+ 221 |
+ 223 |
+
+taos> select GREATEST(5, id) from ts_4893.meters order by ts limit 10;
+ greatest(5, id) |
+========================
+ 5 |
+ 5 |
+ 5 |
+ 5 |
+ 5 |
+ 5 |
+ 6 |
+ 7 |
+ 8 |
+ 9 |
+
+taos> select GREATEST('r', nch1) from ts_4893.meters order by ts limit 10;
+ greatest('r', nch1) |
+=================================
+ r |
+ 一二三四五六七八九十 |
+ update |
+ r |
+ r |
+ r |
+ r |
+ 一二三四五六七八九十 |
+ r |
+ r |
+
+taos> select GREATEST('r', nch1, nch2) from ts_4893.meters order by ts limit 10;
+ greatest('r', nch1, nch2) |
+=================================
+ 四 |
+ 一二三四五六七八九十 |
+ update |
+ 一 |
+ r |
+ 一二三 |
+ r |
+ 一二三四五六七八九十 |
+ r |
+ r |
+
+taos> select GREATEST('r', var1) from ts_4893.meters order by ts limit 10;
+ greatest('r', var1) |
+=================================
+ r |
+ r |
+ r |
+ r |
+ 一二三四五六七八九十 |
+ update |
+ r |
+ r |
+ r |
+ r |
+
+taos> select GREATEST('r', var1, var2) from ts_4893.meters order by ts limit 10;
+ greatest('r', var1, var2) |
+=================================
+ r |
+ 三a |
+ 四 |
+ r |
+ 一二三四五六七八九十 |
+ update |
+ r |
+ r |
+ r |
+ 一 |
+
+taos> select GREATEST('二中文测试', nch1) from ts_4893.meters order by ts limit 10;
+ greatest('二中文测试', nch1) |
+====================================
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+
+taos> select GREATEST('二中文测试', nch1, nch2) from ts_4893.meters order by ts limit 10;
+ greatest('二中文测试', nch1, nch2) |
+==========================================
+ 四 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+
+taos> select GREATEST('二中文测试', var1) from ts_4893.meters order by ts limit 10;
+ greatest('二中文测试', var1) |
+====================================
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+
+taos> select GREATEST('二中文测试', var1, var2) from ts_4893.meters order by ts limit 10;
+ greatest('二中文测试', var1, var2) |
+==========================================
+ 二中文测试 |
+ 二中文测试 |
+ 四 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+ 二中文测试 |
+
+taos> select GREATEST('23', 3443434343434343);
+ greatest('23', 3443434343434343) |
+===================================
+ 3443434343434343 |
+
+taos> select GREATEST(co, 3443434343434343) from ts_4893.n1;
+ greatest(co, 3443434343434343) |
+=================================
+ 3443434343434343 |
+ 3443434343434343 |
+ 3443434343434343 |
+
+taos> select GREATEST('23', 1443434343434343) from ts_4893.n1;
+ greatest('23', 1443434343434343) |
+===================================
+ 1443434343434343 |
+ 1443434343434343 |
+ 1443434343434343 |
+
+taos> select GREATEST('23', 3443434343434343) from ts_4893.n1
+ greatest('23', 3443434343434343) |
+===================================
+ 3443434343434343 |
+ 3443434343434343 |
+ 3443434343434343 |
+
+taos> select GREATEST(current, voltage) from ts_4893.n1;
+ greatest(current, voltage) |
+=============================
+ NULL |
+ NULL |
+ 5 |
+
+taos> select GREATEST(current, voltage, '15') from ts_4893.n1;
+ greatest(current, voltage, '15') |
+===================================
+ NULL |
+ NULL |
+ 15 |
+
diff --git a/tests/army/query/function/ans/least.csv b/tests/army/query/function/ans/least.csv
new file mode 100644
index 0000000000..de66426bd2
--- /dev/null
+++ b/tests/army/query/function/ans/least.csv
@@ -0,0 +1,1389 @@
+
+taos> alter local 'compareAsStrInGreatest' '1';
+
+taos> select LEAST(1,2,3,4,5,6,7,8,9,10);
+ least(1,2,3,4,5,6,7,8,9,10) |
+==============================
+ 1 |
+
+taos> select LEAST(1,1.1,2.23,3.4444,5.66666666,6.21241241,7.999999999999);
+ least(1,1.1,2.23,3.4444,5.66666666,6.21241241,7.999999999999) |
+================================================================
+ 1 |
+
+taos> select LEAST(1,'2',3.3,4.4,5);
+ least(1,'2',3.3,4.4,5) |
+============================
+ 1 |
+
+taos> select LEAST(1,2,3,4,5,'5.1');
+ least(1,2,3,4,5,'5.1') |
+============================
+ 1 |
+
+taos> select LEAST('1','2','3','4',5);
+ least('1','2','3','4',5) |
+============================
+ 1 |
+
+taos> select LEAST('1','2','3','4','5');
+ least('1','2','3','4','5') |
+=============================
+ 1 |
+
+taos> select LEAST(1,2,3,4,5,6,7,'a','b','一','二','三');
+ least(1,2,3,4,5,6,7,'a','b','一','二','三') |
+=================================================
+ 1 |
+
+taos> select LEAST(1,2,3,4,5,6,7,'a','b','c','1','2','1231213');
+ least(1,2,3,4,5,6,7,'a','b','c','1','2','1231213') |
+=====================================================
+ 1 |
+
+taos> select LEAST(1,2,3,4,5,6,7,'a','b','c','1','2','1231213','1231213.123123');
+ least(1,2,3,4,5,6,7,'a','b','c','1','2','1231213','1231213.12312 |
+===================================================================
+ 1 |
+
+taos> select LEAST(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), cast(3 as int), cast(4 as bigint), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)));
+ least(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), |
+===================================================================
+ 0 |
+
+taos> select LEAST(cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as smallint unsigned), cast(3 as int unsigned), cast(4 as bigint unsigned), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)));
+ least(cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as sm |
+===================================================================
+ 0 |
+
+taos> select LEAST(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), cast(3 as int), cast(4 as bigint), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)), cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as smallint unsigned), cast(3 as int unsigned), cast(4 as bigint unsigned), cast(5 as float), cast(6 as double));
+ least(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), |
+===================================================================
+ 0 |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as tinyint));
+ least(cast(100 as tinyint), cast(101 as tinyint)) |
+====================================================
+ 100 |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as smallint));
+ least(cast(100 as tinyint), cast(101 as smallint)) |
+=====================================================
+ 100 |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as int));
+ least(cast(100 as tinyint), cast(101 as int)) |
+================================================
+ 100 |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as bigint));
+ least(cast(100 as tinyint), cast(101 as bigint)) |
+===================================================
+ 100 |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as float));
+ least(cast(100 as tinyint), cast(101 as float)) |
+==================================================
+ 100 |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as double));
+ least(cast(100 as tinyint), cast(101 as double)) |
+===================================================
+ 100 |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as varchar(20)));
+ least(cast(100 as tinyint), cast(101 as varchar(20))) |
+========================================================
+ 100 |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as nchar(20)));
+ least(cast(100 as tinyint), cast(101 as nchar(20))) |
+======================================================
+ 100 |
+
+taos> select LEAST(cast(101 as tinyint), cast(100 as tinyint));
+ least(cast(101 as tinyint), cast(100 as tinyint)) |
+====================================================
+ 100 |
+
+taos> select LEAST(cast(101 as tinyint), cast(100 as smallint));
+ least(cast(101 as tinyint), cast(100 as smallint)) |
+=====================================================
+ 100 |
+
+taos> select LEAST(cast(101 as tinyint), cast(100 as int));
+ least(cast(101 as tinyint), cast(100 as int)) |
+================================================
+ 100 |
+
+taos> select LEAST(cast(101 as tinyint), cast(100 as bigint));
+ least(cast(101 as tinyint), cast(100 as bigint)) |
+===================================================
+ 100 |
+
+taos> select LEAST(cast(101 as tinyint), cast(100 as float));
+ least(cast(101 as tinyint), cast(100 as float)) |
+==================================================
+ 100 |
+
+taos> select LEAST(cast(101 as tinyint), cast(100 as double));
+ least(cast(101 as tinyint), cast(100 as double)) |
+===================================================
+ 100 |
+
+taos> select LEAST(cast(101 as tinyint), cast(100 as varchar(20)));
+ least(cast(101 as tinyint), cast(100 as varchar(20))) |
+========================================================
+ 100 |
+
+taos> select LEAST(cast(101 as tinyint), cast(100 as nchar(20)));
+ least(cast(101 as tinyint), cast(100 as nchar(20))) |
+======================================================
+ 100 |
+
+taos> select LEAST(cast(1000 as smallint), cast(1001 as smallint));
+ least(cast(1000 as smallint), cast(1001 as smallint)) |
+========================================================
+ 1000 |
+
+taos> select LEAST(cast(1000 as smallint), cast(1001 as int));
+ least(cast(1000 as smallint), cast(1001 as int)) |
+===================================================
+ 1000 |
+
+taos> select LEAST(cast(1000 as smallint), cast(1001 as bigint));
+ least(cast(1000 as smallint), cast(1001 as bigint)) |
+======================================================
+ 1000 |
+
+taos> select LEAST(cast(1000 as smallint), cast(1001 as float));
+ least(cast(1000 as smallint), cast(1001 as float)) |
+=====================================================
+ 1000 |
+
+taos> select LEAST(cast(1000 as smallint), cast(1001 as double));
+ least(cast(1000 as smallint), cast(1001 as double)) |
+======================================================
+ 1000 |
+
+taos> select LEAST(cast(1000 as smallint), cast(1001 as varchar(20)));
+ least(cast(1000 as smallint), cast(1001 as varchar(20))) |
+===========================================================
+ 1000 |
+
+taos> select LEAST(cast(1000 as smallint), cast(1001 as nchar(20)));
+ least(cast(1000 as smallint), cast(1001 as nchar(20))) |
+=========================================================
+ 1000 |
+
+taos> select LEAST(cast(1001 as smallint), cast(1000 as smallint));
+ least(cast(1001 as smallint), cast(1000 as smallint)) |
+========================================================
+ 1000 |
+
+taos> select LEAST(cast(1001 as smallint), cast(1000 as int));
+ least(cast(1001 as smallint), cast(1000 as int)) |
+===================================================
+ 1000 |
+
+taos> select LEAST(cast(1001 as smallint), cast(1000 as bigint));
+ least(cast(1001 as smallint), cast(1000 as bigint)) |
+======================================================
+ 1000 |
+
+taos> select LEAST(cast(1001 as smallint), cast(1000 as float));
+ least(cast(1001 as smallint), cast(1000 as float)) |
+=====================================================
+ 1000 |
+
+taos> select LEAST(cast(1001 as smallint), cast(1000 as double));
+ least(cast(1001 as smallint), cast(1000 as double)) |
+======================================================
+ 1000 |
+
+taos> select LEAST(cast(1001 as smallint), cast(1000 as varchar(20)));
+ least(cast(1001 as smallint), cast(1000 as varchar(20))) |
+===========================================================
+ 1000 |
+
+taos> select LEAST(cast(1001 as smallint), cast(1000 as nchar(20)));
+ least(cast(1001 as smallint), cast(1000 as nchar(20))) |
+=========================================================
+ 1000 |
+
+taos> select LEAST(cast(1000000 as int), cast(1000001 as int));
+ least(cast(1000000 as int), cast(1000001 as int)) |
+====================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000000 as int), cast(1000001 as bigint));
+ least(cast(1000000 as int), cast(1000001 as bigint)) |
+=======================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000000 as int), cast(1000001 as float));
+ least(cast(1000000 as int), cast(1000001 as float)) |
+======================================================
+ 1e+06 |
+
+taos> select LEAST(cast(1000000 as int), cast(1000001 as double));
+ least(cast(1000000 as int), cast(1000001 as double)) |
+=======================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000000 as int), cast(1000001 as varchar(20)));
+ least(cast(1000000 as int), cast(1000001 as varchar(20))) |
+============================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000000 as int), cast(1000001 as nchar(20)));
+ least(cast(1000000 as int), cast(1000001 as nchar(20))) |
+==========================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000001 as int), cast(1000000 as int));
+ least(cast(1000001 as int), cast(1000000 as int)) |
+====================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000001 as int), cast(1000000 as bigint));
+ least(cast(1000001 as int), cast(1000000 as bigint)) |
+=======================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000001 as int), cast(1000000 as float));
+ least(cast(1000001 as int), cast(1000000 as float)) |
+======================================================
+ 1e+06 |
+
+taos> select LEAST(cast(1000001 as int), cast(1000000 as double));
+ least(cast(1000001 as int), cast(1000000 as double)) |
+=======================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000001 as int), cast(1000000 as varchar(20)));
+ least(cast(1000001 as int), cast(1000000 as varchar(20))) |
+============================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000001 as int), cast(1000000 as nchar(20)));
+ least(cast(1000001 as int), cast(1000000 as nchar(20))) |
+==========================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000000000 as bigint), cast(1000000001 as bigint));
+ least(cast(1000000000 as bigint), cast(1000000001 as bigint)) |
+================================================================
+ 1000000000 |
+
+taos> select LEAST(cast(1000000000 as bigint), cast(1000000001 as float));
+ least(cast(1000000000 as bigint), cast(1000000001 as float)) |
+===============================================================
+ 1e+09 |
+
+taos> select LEAST(cast(1000000000 as bigint), cast(1000000001 as double));
+ least(cast(1000000000 as bigint), cast(1000000001 as double)) |
+================================================================
+ 1000000000 |
+
+taos> select LEAST(cast(1000000000 as bigint), cast(1000000001 as varchar(20)));
+ least(cast(1000000000 as bigint), cast(1000000001 as varchar(20) |
+===================================================================
+ 1000000000 |
+
+taos> select LEAST(cast(1000000000 as bigint), cast(1000000001 as nchar(20)));
+ least(cast(1000000000 as bigint), cast(1000000001 as nchar(20))) |
+===================================================================
+ 1000000000 |
+
+taos> select LEAST(cast(1000000001 as bigint), cast(1000000000 as bigint));
+ least(cast(1000000001 as bigint), cast(1000000000 as bigint)) |
+================================================================
+ 1000000000 |
+
+taos> select LEAST(cast(1000000001 as bigint), cast(1000000000 as float));
+ least(cast(1000000001 as bigint), cast(1000000000 as float)) |
+===============================================================
+ 1e+09 |
+
+taos> select LEAST(cast(1000000001 as bigint), cast(1000000000 as double));
+ least(cast(1000000001 as bigint), cast(1000000000 as double)) |
+================================================================
+ 1000000000 |
+
+taos> select LEAST(cast(1000000001 as bigint), cast(1000000000 as varchar(20)));
+ least(cast(1000000001 as bigint), cast(1000000000 as varchar(20) |
+===================================================================
+ 1000000000 |
+
+taos> select LEAST(cast(1000000001 as bigint), cast(1000000000 as nchar(20)));
+ least(cast(1000000001 as bigint), cast(1000000000 as nchar(20))) |
+===================================================================
+ 1000000000 |
+
+taos> select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as float));
+ least(cast(100000.1111111 as float), cast(100001.1111111 as floa |
+===================================================================
+ 100000 |
+
+taos> select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as double));
+ least(cast(100000.1111111 as float), cast(100001.1111111 as doub |
+===================================================================
+ 100000.109375 |
+
+taos> select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as timestamp));
+ least(cast(100000.1111111 as float), cast(100001.1111111 as time |
+===================================================================
+ 100000 |
+
+taos> select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as varchar(20)));
+ least(cast(100000.1111111 as float), cast(100001.1111111 as varc |
+===================================================================
+ 100000.109375 |
+
+taos> select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as nchar(20)));
+ least(cast(100000.1111111 as float), cast(100001.1111111 as ncha |
+===================================================================
+ 100000.109375 |
+
+taos> select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as float));
+ least(cast(100001.1111111 as float), cast(100000.1111111 as floa |
+===================================================================
+ 100000 |
+
+taos> select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as double));
+ least(cast(100001.1111111 as float), cast(100000.1111111 as doub |
+===================================================================
+ 100000.1111111 |
+
+taos> select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as timestamp));
+ least(cast(100001.1111111 as float), cast(100000.1111111 as time |
+===================================================================
+ 100000 |
+
+taos> select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as varchar(20)));
+ least(cast(100001.1111111 as float), cast(100000.1111111 as varc |
+===================================================================
+ 100000.1111111 |
+
+taos> select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as nchar(20)));
+ least(cast(100001.1111111 as float), cast(100000.1111111 as ncha |
+===================================================================
+ 100000.1111111 |
+
+taos> select LEAST(cast(100000.1111111 as double), cast(100001.1111111 as double));
+ least(cast(100000.1111111 as double), cast(100001.1111111 as dou |
+===================================================================
+ 100000.1111111 |
+
+taos> select LEAST(cast(100000.1111111 as double), cast(100001.1111111 as timestamp));
+ least(cast(100000.1111111 as double), cast(100001.1111111 as tim |
+===================================================================
+ 100000.1111111 |
+
+taos> select LEAST(cast(100000.1111111 as double), cast(100001.1111111 as varchar(20)));
+ least(cast(100000.1111111 as double), cast(100001.1111111 as var |
+===================================================================
+ 100000.111111 |
+
+taos> select LEAST(cast(100000.1111111 as double), cast(100001.1111111 as nchar(20)));
+ least(cast(100000.1111111 as double), cast(100001.1111111 as nch |
+===================================================================
+ 100000.111111 |
+
+taos> select LEAST(cast(100001.1111111 as double), cast(100000.1111111 as double));
+ least(cast(100001.1111111 as double), cast(100000.1111111 as dou |
+===================================================================
+ 100000.1111111 |
+
+taos> select LEAST(cast(100001.1111111 as double), cast(100000.1111111 as timestamp));
+ least(cast(100001.1111111 as double), cast(100000.1111111 as tim |
+===================================================================
+ 100000 |
+
+taos> select LEAST(cast(100001.1111111 as double), cast(100000.1111111 as varchar(20)));
+ least(cast(100001.1111111 as double), cast(100000.1111111 as var |
+===================================================================
+ 100000.1111111 |
+
+taos> select LEAST(cast(100001.1111111 as double), cast(100000.1111111 as nchar(20)));
+ least(cast(100001.1111111 as double), cast(100000.1111111 as nch |
+===================================================================
+ 100000.1111111 |
+
+taos> select LEAST(cast('中文测试' as varchar(20)), cast('中文测试一' as varchar(20)));
+ least(cast('中文测试' as varchar(20)), cast('中文测试一 |
+===================================================================
+ 中文测试 |
+
+taos> select LEAST(cast('中文测试' as varchar(20)), cast('中文测试一' as nchar(20)));
+ least(cast('中文测试' as varchar(20)), cast('中文测试一 |
+===================================================================
+ 中文测试 |
+
+taos> select LEAST(cast('中文测试一' as varchar(20)), cast('中文测试' as varchar(20)));
+ least(cast('中文测试一' as varchar(20)), cast('中文测试 |
+===================================================================
+ 中文测试 |
+
+taos> select LEAST(cast('中文测试一' as varchar(20)), cast('中文测试' as nchar(20)));
+ least(cast('中文测试一' as varchar(20)), cast('中文测试 |
+===================================================================
+ 中文测试 |
+
+taos> select LEAST(cast('abc123abc' as varchar(20)), cast('abc124abc' as varchar(20)));
+ least(cast('abc123abc' as varchar(20)), cast('abc124abc' as varc |
+===================================================================
+ abc123abc |
+
+taos> select LEAST(cast('abc123abc' as varchar(20)), cast('abc124abc' as nchar(20)));
+ least(cast('abc123abc' as varchar(20)), cast('abc124abc' as ncha |
+===================================================================
+ abc123abc |
+
+taos> select LEAST(cast('abc124abc' as varchar(20)), cast('abc123abc' as varchar(20)));
+ least(cast('abc124abc' as varchar(20)), cast('abc123abc' as varc |
+===================================================================
+ abc123abc |
+
+taos> select LEAST(cast('abc124abc' as varchar(20)), cast('abc123abc' as nchar(20)));
+ least(cast('abc124abc' as varchar(20)), cast('abc123abc' as ncha |
+===================================================================
+ abc123abc |
+
+taos> select LEAST(cast('abc123abc' as nchar(20)), cast('abc124abc' as nchar(20)));
+ least(cast('abc123abc' as nchar(20)), cast('abc124abc' as nchar( |
+===================================================================
+ abc123abc |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as float), cast(102 as varchar(20)));
+ least(cast(100 as tinyint), cast(101 as float), cast(102 as varc |
+===================================================================
+ 100 |
+
+taos> select LEAST(cast(100 as varchar(20)), cast(101 as float), cast(102 as tinyint));
+ least(cast(100 as varchar(20)), cast(101 as float), cast(102 as |
+===================================================================
+ 100 |
+
+taos> select LEAST('a','b','c','d','e','f','g','h','1231','15155');
+ least('a','b','c','d','e','f','g','h','1231','15155') |
+========================================================
+ 1231 |
+
+taos> select LEAST(current, voltage, phase, id, nch1, nch2, var1, var2) from ts_4893.meters order by ts limit 10;
+ least(current, voltage, phase, id, nch1, nch2, var1, var2) |
+=============================================================
+ 0 |
+ 0.138830 |
+ 0.796942 |
+ 0.537330 |
+ 0.313430 |
+ 0.332767 |
+ 0.846763 |
+ 0.637813 |
+ 0.115989 |
+ 0.373575 |
+
+taos> select LEAST(current, voltage, phase, id) from ts_4893.meters order by ts limit 10;
+ least(current, voltage, phase, id) |
+=====================================
+ 0 |
+ 0.13883 |
+ 0.796942 |
+ 0.53733 |
+ 0.31343 |
+ 0.332767 |
+ 0.846763 |
+ 0.637813 |
+ 0.115989 |
+ 0.373575 |
+
+taos> select LEAST(nch1, nch2, var1, var2) from ts_4893.meters order by ts limit 10;
+ least(nch1, nch2, var1, var2) |
+=================================
+ e |
+ f |
+ c |
+ e |
+ b |
+ g |
+ again |
+ b |
+ c |
+ again |
+
+taos> select LEAST(221, voltage) from ts_4893.meters order by ts limit 10;
+ least(221, voltage) |
+========================
+ 221 |
+ 220 |
+ 215 |
+ 216 |
+ 219 |
+ 221 |
+ 215 |
+ 217 |
+ 216 |
+ 221 |
+
+taos> select LEAST(5, id) from ts_4893.meters order by ts limit 10;
+ least(5, id) |
+========================
+ 0 |
+ 1 |
+ 2 |
+ 3 |
+ 4 |
+ 5 |
+ 5 |
+ 5 |
+ 5 |
+ 5 |
+
+taos> select LEAST('r', nch1) from ts_4893.meters order by ts limit 10;
+ least('r', nch1) |
+=================================
+ novel |
+ r |
+ r |
+ prision |
+ novel |
+ novel |
+ again |
+ r |
+ novel |
+ again |
+
+taos> select LEAST('r', nch1, nch2) from ts_4893.meters order by ts limit 10;
+ least('r', nch1, nch2) |
+=================================
+ novel |
+ f |
+ c |
+ prision |
+ e |
+ novel |
+ again |
+ d |
+ c |
+ again |
+
+taos> select LEAST('r', var1) from ts_4893.meters order by ts limit 10;
+ least('r', var1) |
+=================================
+ novel |
+ person |
+ novel |
+ plate |
+ r |
+ r |
+ prision |
+ person |
+ prision |
+ plate |
+
+taos> select LEAST('r', var1, var2) from ts_4893.meters order by ts limit 10;
+ least('r', var1, var2) |
+=================================
+ e |
+ person |
+ novel |
+ e |
+ b |
+ g |
+ b |
+ b |
+ e |
+ plate |
+
+taos> select LEAST('二中文测试', nch1) from ts_4893.meters order by ts limit 10;
+ least('二中文测试', nch1) |
+=================================
+ novel |
+ 一二三四五六七八九十 |
+ update |
+ prision |
+ novel |
+ novel |
+ again |
+ 一二三四五六七八九十 |
+ novel |
+ again |
+
+taos> select LEAST('二中文测试', nch1, nch2) from ts_4893.meters order by ts limit 10;
+ least('二中文测试', nch1, nch2) |
+=======================================
+ novel |
+ f |
+ c |
+ prision |
+ e |
+ novel |
+ again |
+ d |
+ c |
+ again |
+
+taos> select LEAST('二中文测试', var1) from ts_4893.meters order by ts limit 10;
+ least('二中文测试', var1) |
+=================================
+ novel |
+ person |
+ novel |
+ plate |
+ 一二三四五六七八九十 |
+ update |
+ prision |
+ person |
+ prision |
+ plate |
+
+taos> select LEAST('二中文测试', var1, var2) from ts_4893.meters order by ts limit 10;
+ least('二中文测试', var1, var2) |
+=======================================
+ e |
+ person |
+ novel |
+ e |
+ b |
+ g |
+ b |
+ b |
+ e |
+ plate |
+
+taos> select LEAST('23', 3443434343434343);
+ least('23', 3443434343434343) |
+================================
+ 23 |
+
+taos> select LEAST(co, 3443434343434343) from ts_4893.n1;
+ least(co, 3443434343434343) |
+=================================
+ 23 |
+ 23 |
+ 23 |
+
+taos> select LEAST('23', 3443434343434343) from ts_4893.n1;
+ least('23', 3443434343434343) |
+================================
+ 23 |
+ 23 |
+ 23 |
+
+taos> select LEAST('23', 1443434343434343) from ts_4893.n1;
+ least('23', 1443434343434343) |
+================================
+ 1443434343434343 |
+ 1443434343434343 |
+ 1443434343434343 |
+
+taos> select LEAST(current, voltage) from ts_4893.n1;
+ least(current, voltage) |
+==========================
+ NULL |
+ NULL |
+ 3 |
+
+taos> select LEAST(current, voltage, '15') from ts_4893.n1;
+ least(current, voltage, '15') |
+================================
+ NULL |
+ NULL |
+ 15 |
+
+taos> alter local 'compareAsStrInGreatest' '0';
+
+taos> select LEAST(1,2,3,4,5,6,7,8,9,10);
+ least(1,2,3,4,5,6,7,8,9,10) |
+==============================
+ 1 |
+
+taos> select LEAST(1,1.1,2.23,3.4444,5.66666666,6.21241241,7.999999999999);
+ least(1,1.1,2.23,3.4444,5.66666666,6.21241241,7.999999999999) |
+================================================================
+ 1 |
+
+taos> select LEAST(1,'2',3.3,4.4,5);
+ least(1,'2',3.3,4.4,5) |
+============================
+ 1 |
+
+taos> select LEAST(1,2,3,4,5,'5.1');
+ least(1,2,3,4,5,'5.1') |
+=========================
+ 1 |
+
+taos> select LEAST('1','2','3','4',5);
+ least('1','2','3','4',5) |
+===========================
+ 1 |
+
+taos> select LEAST('1','2','3','4','5');
+ least('1','2','3','4','5') |
+=============================
+ 1 |
+
+taos> select LEAST(1,2,3,4,5,6,7,'a','b','一','二','三');
+ least(1,2,3,4,5,6,7,'a','b','一','二','三') |
+=================================================
+ 0 |
+
+taos> select LEAST(1,2,3,4,5,6,7,'a','b','c','1','2','1231213');
+ least(1,2,3,4,5,6,7,'a','b','c','1','2','1231213') |
+=====================================================
+ 0 |
+
+taos> select LEAST(1,2,3,4,5,6,7,'a','b','c','1','2','1231213','1231213.123123');
+ least(1,2,3,4,5,6,7,'a','b','c','1','2','1231213','1231213.12312 |
+===================================================================
+ 0 |
+
+taos> select LEAST(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), cast(3 as int), cast(4 as bigint), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)));
+ least(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), |
+===================================================================
+ 0 |
+
+taos> select LEAST(cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as smallint unsigned), cast(3 as int unsigned), cast(4 as bigint unsigned), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)));
+ least(cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as sm |
+===================================================================
+ 0 |
+
+taos> select LEAST(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), cast(3 as int), cast(4 as bigint), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)), cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as smallint unsigned), cast(3 as int unsigned), cast(4 as bigint unsigned), cast(5 as float), cast(6 as double));
+ least(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), |
+===================================================================
+ 0 |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as tinyint));
+ least(cast(100 as tinyint), cast(101 as tinyint)) |
+====================================================
+ 100 |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as smallint));
+ least(cast(100 as tinyint), cast(101 as smallint)) |
+=====================================================
+ 100 |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as int));
+ least(cast(100 as tinyint), cast(101 as int)) |
+================================================
+ 100 |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as bigint));
+ least(cast(100 as tinyint), cast(101 as bigint)) |
+===================================================
+ 100 |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as float));
+ least(cast(100 as tinyint), cast(101 as float)) |
+==================================================
+ 100 |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as double));
+ least(cast(100 as tinyint), cast(101 as double)) |
+===================================================
+ 100 |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as varchar(20)));
+ least(cast(100 as tinyint), cast(101 as varchar(20))) |
+========================================================
+ 100 |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as nchar(20)));
+ least(cast(100 as tinyint), cast(101 as nchar(20))) |
+======================================================
+ 100 |
+
+taos> select LEAST(cast(101 as tinyint), cast(100 as tinyint));
+ least(cast(101 as tinyint), cast(100 as tinyint)) |
+====================================================
+ 100 |
+
+taos> select LEAST(cast(101 as tinyint), cast(100 as smallint));
+ least(cast(101 as tinyint), cast(100 as smallint)) |
+=====================================================
+ 100 |
+
+taos> select LEAST(cast(101 as tinyint), cast(100 as int));
+ least(cast(101 as tinyint), cast(100 as int)) |
+================================================
+ 100 |
+
+taos> select LEAST(cast(101 as tinyint), cast(100 as bigint));
+ least(cast(101 as tinyint), cast(100 as bigint)) |
+===================================================
+ 100 |
+
+taos> select LEAST(cast(101 as tinyint), cast(100 as float));
+ least(cast(101 as tinyint), cast(100 as float)) |
+==================================================
+ 100 |
+
+taos> select LEAST(cast(101 as tinyint), cast(100 as double));
+ least(cast(101 as tinyint), cast(100 as double)) |
+===================================================
+ 100 |
+
+taos> select LEAST(cast(101 as tinyint), cast(100 as varchar(20)));
+ least(cast(101 as tinyint), cast(100 as varchar(20))) |
+========================================================
+ 100 |
+
+taos> select LEAST(cast(101 as tinyint), cast(100 as nchar(20)));
+ least(cast(101 as tinyint), cast(100 as nchar(20))) |
+======================================================
+ 100 |
+
+taos> select LEAST(cast(1000 as smallint), cast(1001 as smallint));
+ least(cast(1000 as smallint), cast(1001 as smallint)) |
+========================================================
+ 1000 |
+
+taos> select LEAST(cast(1000 as smallint), cast(1001 as int));
+ least(cast(1000 as smallint), cast(1001 as int)) |
+===================================================
+ 1000 |
+
+taos> select LEAST(cast(1000 as smallint), cast(1001 as bigint));
+ least(cast(1000 as smallint), cast(1001 as bigint)) |
+======================================================
+ 1000 |
+
+taos> select LEAST(cast(1000 as smallint), cast(1001 as float));
+ least(cast(1000 as smallint), cast(1001 as float)) |
+=====================================================
+ 1000 |
+
+taos> select LEAST(cast(1000 as smallint), cast(1001 as double));
+ least(cast(1000 as smallint), cast(1001 as double)) |
+======================================================
+ 1000 |
+
+taos> select LEAST(cast(1000 as smallint), cast(1001 as varchar(20)));
+ least(cast(1000 as smallint), cast(1001 as varchar(20))) |
+===========================================================
+ 1000 |
+
+taos> select LEAST(cast(1000 as smallint), cast(1001 as nchar(20)));
+ least(cast(1000 as smallint), cast(1001 as nchar(20))) |
+=========================================================
+ 1000 |
+
+taos> select LEAST(cast(1001 as smallint), cast(1000 as smallint));
+ least(cast(1001 as smallint), cast(1000 as smallint)) |
+========================================================
+ 1000 |
+
+taos> select LEAST(cast(1001 as smallint), cast(1000 as int));
+ least(cast(1001 as smallint), cast(1000 as int)) |
+===================================================
+ 1000 |
+
+taos> select LEAST(cast(1001 as smallint), cast(1000 as bigint));
+ least(cast(1001 as smallint), cast(1000 as bigint)) |
+======================================================
+ 1000 |
+
+taos> select LEAST(cast(1001 as smallint), cast(1000 as float));
+ least(cast(1001 as smallint), cast(1000 as float)) |
+=====================================================
+ 1000 |
+
+taos> select LEAST(cast(1001 as smallint), cast(1000 as double));
+ least(cast(1001 as smallint), cast(1000 as double)) |
+======================================================
+ 1000 |
+
+taos> select LEAST(cast(1001 as smallint), cast(1000 as varchar(20)));
+ least(cast(1001 as smallint), cast(1000 as varchar(20))) |
+===========================================================
+ 1000 |
+
+taos> select LEAST(cast(1001 as smallint), cast(1000 as nchar(20)));
+ least(cast(1001 as smallint), cast(1000 as nchar(20))) |
+=========================================================
+ 1000 |
+
+taos> select LEAST(cast(1000000 as int), cast(1000001 as int));
+ least(cast(1000000 as int), cast(1000001 as int)) |
+====================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000000 as int), cast(1000001 as bigint));
+ least(cast(1000000 as int), cast(1000001 as bigint)) |
+=======================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000000 as int), cast(1000001 as float));
+ least(cast(1000000 as int), cast(1000001 as float)) |
+======================================================
+ 1e+06 |
+
+taos> select LEAST(cast(1000000 as int), cast(1000001 as double));
+ least(cast(1000000 as int), cast(1000001 as double)) |
+=======================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000000 as int), cast(1000001 as varchar(20)));
+ least(cast(1000000 as int), cast(1000001 as varchar(20))) |
+============================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000000 as int), cast(1000001 as nchar(20)));
+ least(cast(1000000 as int), cast(1000001 as nchar(20))) |
+==========================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000001 as int), cast(1000000 as int));
+ least(cast(1000001 as int), cast(1000000 as int)) |
+====================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000001 as int), cast(1000000 as bigint));
+ least(cast(1000001 as int), cast(1000000 as bigint)) |
+=======================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000001 as int), cast(1000000 as float));
+ least(cast(1000001 as int), cast(1000000 as float)) |
+======================================================
+ 1e+06 |
+
+taos> select LEAST(cast(1000001 as int), cast(1000000 as double));
+ least(cast(1000001 as int), cast(1000000 as double)) |
+=======================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000001 as int), cast(1000000 as varchar(20)));
+ least(cast(1000001 as int), cast(1000000 as varchar(20))) |
+============================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000001 as int), cast(1000000 as nchar(20)));
+ least(cast(1000001 as int), cast(1000000 as nchar(20))) |
+==========================================================
+ 1000000 |
+
+taos> select LEAST(cast(1000000000 as bigint), cast(1000000001 as bigint));
+ least(cast(1000000000 as bigint), cast(1000000001 as bigint)) |
+================================================================
+ 1000000000 |
+
+taos> select LEAST(cast(1000000000 as bigint), cast(1000000001 as float));
+ least(cast(1000000000 as bigint), cast(1000000001 as float)) |
+===============================================================
+ 1e+09 |
+
+taos> select LEAST(cast(1000000000 as bigint), cast(1000000001 as double));
+ least(cast(1000000000 as bigint), cast(1000000001 as double)) |
+================================================================
+ 1000000000 |
+
+taos> select LEAST(cast(1000000000 as bigint), cast(1000000001 as varchar(20)));
+ least(cast(1000000000 as bigint), cast(1000000001 as varchar(20) |
+===================================================================
+ 1000000000 |
+
+taos> select LEAST(cast(1000000000 as bigint), cast(1000000001 as nchar(20)));
+ least(cast(1000000000 as bigint), cast(1000000001 as nchar(20))) |
+===================================================================
+ 1000000000 |
+
+taos> select LEAST(cast(1000000001 as bigint), cast(1000000000 as bigint));
+ least(cast(1000000001 as bigint), cast(1000000000 as bigint)) |
+================================================================
+ 1000000000 |
+
+taos> select LEAST(cast(1000000001 as bigint), cast(1000000000 as float));
+ least(cast(1000000001 as bigint), cast(1000000000 as float)) |
+===============================================================
+ 1e+09 |
+
+taos> select LEAST(cast(1000000001 as bigint), cast(1000000000 as double));
+ least(cast(1000000001 as bigint), cast(1000000000 as double)) |
+================================================================
+ 1000000000 |
+
+taos> select LEAST(cast(1000000001 as bigint), cast(1000000000 as varchar(20)));
+ least(cast(1000000001 as bigint), cast(1000000000 as varchar(20) |
+===================================================================
+ 1000000000 |
+
+taos> select LEAST(cast(1000000001 as bigint), cast(1000000000 as nchar(20)));
+ least(cast(1000000001 as bigint), cast(1000000000 as nchar(20))) |
+===================================================================
+ 1000000000 |
+
+taos> select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as float));
+ least(cast(100000.1111111 as float), cast(100001.1111111 as floa |
+===================================================================
+ 100000 |
+
+taos> select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as double));
+ least(cast(100000.1111111 as float), cast(100001.1111111 as doub |
+===================================================================
+ 100000.109375 |
+
+taos> select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as timestamp));
+ least(cast(100000.1111111 as float), cast(100001.1111111 as time |
+===================================================================
+ 100000 |
+
+taos> select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as varchar(20)));
+ least(cast(100000.1111111 as float), cast(100001.1111111 as varc |
+===================================================================
+ 100000 |
+
+taos> select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as nchar(20)));
+ least(cast(100000.1111111 as float), cast(100001.1111111 as ncha |
+===================================================================
+ 100000 |
+
+taos> select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as float));
+ least(cast(100001.1111111 as float), cast(100000.1111111 as floa |
+===================================================================
+ 100000 |
+
+taos> select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as double));
+ least(cast(100001.1111111 as float), cast(100000.1111111 as doub |
+===================================================================
+ 100000.1111111 |
+
+taos> select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as timestamp));
+ least(cast(100001.1111111 as float), cast(100000.1111111 as time |
+===================================================================
+ 100000 |
+
+taos> select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as varchar(20)));
+ least(cast(100001.1111111 as float), cast(100000.1111111 as varc |
+===================================================================
+ 100000 |
+
+taos> select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as nchar(20)));
+ least(cast(100001.1111111 as float), cast(100000.1111111 as ncha |
+===================================================================
+ 100000 |
+
+taos> select LEAST(cast(100000.1111111 as double), cast(100001.1111111 as double));
+ least(cast(100000.1111111 as double), cast(100001.1111111 as dou |
+===================================================================
+ 100000.1111111 |
+
+taos> select LEAST(cast(100000.1111111 as double), cast(100001.1111111 as timestamp));
+ least(cast(100000.1111111 as double), cast(100001.1111111 as tim |
+===================================================================
+ 100000.1111111 |
+
+taos> select LEAST(cast(100000.1111111 as double), cast(100001.1111111 as varchar(20)));
+ least(cast(100000.1111111 as double), cast(100001.1111111 as var |
+===================================================================
+ 100000.1111111 |
+
+taos> select LEAST(cast(100000.1111111 as double), cast(100001.1111111 as nchar(20)));
+ least(cast(100000.1111111 as double), cast(100001.1111111 as nch |
+===================================================================
+ 100000.1111111 |
+
+taos> select LEAST(cast(100001.1111111 as double), cast(100000.1111111 as double));
+ least(cast(100001.1111111 as double), cast(100000.1111111 as dou |
+===================================================================
+ 100000.1111111 |
+
+taos> select LEAST(cast(100001.1111111 as double), cast(100000.1111111 as timestamp));
+ least(cast(100001.1111111 as double), cast(100000.1111111 as tim |
+===================================================================
+ 100000 |
+
+taos> select LEAST(cast(100001.1111111 as double), cast(100000.1111111 as varchar(20)));
+ least(cast(100001.1111111 as double), cast(100000.1111111 as var |
+===================================================================
+ 100000.1111111 |
+
+taos> select LEAST(cast(100001.1111111 as double), cast(100000.1111111 as nchar(20)));
+ least(cast(100001.1111111 as double), cast(100000.1111111 as nch |
+===================================================================
+ 100000.1111111 |
+
+taos> select LEAST(cast('中文测试' as varchar(20)), cast('中文测试一' as varchar(20)));
+ least(cast('中文测试' as varchar(20)), cast('中文测试一 |
+===================================================================
+ 中文测试 |
+
+taos> select LEAST(cast('中文测试' as varchar(20)), cast('中文测试一' as nchar(20)));
+ least(cast('中文测试' as varchar(20)), cast('中文测试一 |
+===================================================================
+ 中文测试 |
+
+taos> select LEAST(cast('中文测试一' as varchar(20)), cast('中文测试' as varchar(20)));
+ least(cast('中文测试一' as varchar(20)), cast('中文测试 |
+===================================================================
+ 中文测试 |
+
+taos> select LEAST(cast('中文测试一' as varchar(20)), cast('中文测试' as nchar(20)));
+ least(cast('中文测试一' as varchar(20)), cast('中文测试 |
+===================================================================
+ 中文测试 |
+
+taos> select LEAST(cast('abc123abc' as varchar(20)), cast('abc124abc' as varchar(20)));
+ least(cast('abc123abc' as varchar(20)), cast('abc124abc' as varc |
+===================================================================
+ abc123abc |
+
+taos> select LEAST(cast('abc123abc' as varchar(20)), cast('abc124abc' as nchar(20)));
+ least(cast('abc123abc' as varchar(20)), cast('abc124abc' as ncha |
+===================================================================
+ abc123abc |
+
+taos> select LEAST(cast('abc124abc' as varchar(20)), cast('abc123abc' as varchar(20)));
+ least(cast('abc124abc' as varchar(20)), cast('abc123abc' as varc |
+===================================================================
+ abc123abc |
+
+taos> select LEAST(cast('abc124abc' as varchar(20)), cast('abc123abc' as nchar(20)));
+ least(cast('abc124abc' as varchar(20)), cast('abc123abc' as ncha |
+===================================================================
+ abc123abc |
+
+taos> select LEAST(cast('abc123abc' as nchar(20)), cast('abc124abc' as nchar(20)));
+ least(cast('abc123abc' as nchar(20)), cast('abc124abc' as nchar( |
+===================================================================
+ abc123abc |
+
+taos> select LEAST(cast(100 as tinyint), cast(101 as float), cast(102 as varchar(20)));
+ least(cast(100 as tinyint), cast(101 as float), cast(102 as varc |
+===================================================================
+ 100 |
+
+taos> select LEAST(cast(100 as varchar(20)), cast(101 as float), cast(102 as tinyint));
+ least(cast(100 as varchar(20)), cast(101 as float), cast(102 as |
+===================================================================
+ 100 |
+
+taos> select LEAST('a','b','c','d','e','f','g','h','1231','15155');
+ least('a','b','c','d','e','f','g','h','1231','15155') |
+========================================================
+ 1231 |
+
+taos> select LEAST(current, voltage, phase, id, nch1, nch2, var1, var2) from ts_4893.meters order by ts limit 10;
+ least(current, voltage, phase, id, nch1, nch2, var1, var2) |
+=============================================================
+ 0 |
+ 0 |
+ 0 |
+ 0 |
+ 0 |
+ 0 |
+ 0 |
+ 0 |
+ 0 |
+ 0 |
+
+taos> select LEAST(current, voltage, phase, id) from ts_4893.meters order by ts limit 10;
+ least(current, voltage, phase, id) |
+=====================================
+ 0 |
+ 0.13883 |
+ 0.796942 |
+ 0.53733 |
+ 0.31343 |
+ 0.332767 |
+ 0.846763 |
+ 0.637813 |
+ 0.115989 |
+ 0.373575 |
+
+taos> select LEAST(nch1, nch2, var1, var2) from ts_4893.meters order by ts limit 10;
+ least(nch1, nch2, var1, var2) |
+=================================
+ e |
+ f |
+ c |
+ e |
+ b |
+ g |
+ again |
+ b |
+ c |
+ again |
+
+taos> select LEAST(221, voltage) from ts_4893.meters order by ts limit 10;
+ least(221, voltage) |
+========================
+ 221 |
+ 220 |
+ 215 |
+ 216 |
+ 219 |
+ 221 |
+ 215 |
+ 217 |
+ 216 |
+ 221 |
+
+taos> select LEAST(5, id) from ts_4893.meters order by ts limit 10;
+ least(5, id) |
+========================
+ 0 |
+ 1 |
+ 2 |
+ 3 |
+ 4 |
+ 5 |
+ 5 |
+ 5 |
+ 5 |
+ 5 |
+
+taos> select LEAST('r', nch1) from ts_4893.meters order by ts limit 10;
+ least('r', nch1) |
+=================================
+ novel |
+ r |
+ r |
+ prision |
+ novel |
+ novel |
+ again |
+ r |
+ novel |
+ again |
+
+taos> select LEAST('r', nch1, nch2) from ts_4893.meters order by ts limit 10;
+ least('r', nch1, nch2) |
+=================================
+ novel |
+ f |
+ c |
+ prision |
+ e |
+ novel |
+ again |
+ d |
+ c |
+ again |
+
+taos> select LEAST('r', var1) from ts_4893.meters order by ts limit 10;
+ least('r', var1) |
+=================================
+ novel |
+ person |
+ novel |
+ plate |
+ r |
+ r |
+ prision |
+ person |
+ prision |
+ plate |
+
+taos> select LEAST('r', var1, var2) from ts_4893.meters order by ts limit 10;
+ least('r', var1, var2) |
+=================================
+ e |
+ person |
+ novel |
+ e |
+ b |
+ g |
+ b |
+ b |
+ e |
+ plate |
+
+taos> select LEAST('二中文测试', nch1) from ts_4893.meters order by ts limit 10;
+ least('二中文测试', nch1) |
+=================================
+ novel |
+ 一二三四五六七八九十 |
+ update |
+ prision |
+ novel |
+ novel |
+ again |
+ 一二三四五六七八九十 |
+ novel |
+ again |
+
+taos> select LEAST('二中文测试', nch1, nch2) from ts_4893.meters order by ts limit 10;
+ least('二中文测试', nch1, nch2) |
+=======================================
+ novel |
+ f |
+ c |
+ prision |
+ e |
+ novel |
+ again |
+ d |
+ c |
+ again |
+
+taos> select LEAST('二中文测试', var1) from ts_4893.meters order by ts limit 10;
+ least('二中文测试', var1) |
+=================================
+ novel |
+ person |
+ novel |
+ plate |
+ 一二三四五六七八九十 |
+ update |
+ prision |
+ person |
+ prision |
+ plate |
+
+taos> select LEAST('二中文测试', var1, var2) from ts_4893.meters order by ts limit 10;
+ least('二中文测试', var1, var2) |
+=======================================
+ e |
+ person |
+ novel |
+ e |
+ b |
+ g |
+ b |
+ b |
+ e |
+ plate |
+
+taos> select LEAST('23', 3443434343434343);
+ least('23', 3443434343434343) |
+================================
+ 23 |
+
+taos> select LEAST(co, 3443434343434343) from ts_4893.n1;
+ least(co, 3443434343434343) |
+==============================
+ 23 |
+ 23 |
+ 23 |
+
+taos> select LEAST('23', 3443434343434343) from ts_4893.n1;
+ least('23', 3443434343434343) |
+================================
+ 23 |
+ 23 |
+ 23 |
+
+taos> select LEAST('23', 1443434343434343) from ts_4893.n1;
+ least('23', 1443434343434343) |
+================================
+ 23 |
+ 23 |
+ 23 |
+
+taos> select LEAST(current, voltage) from ts_4893.n1;
+ least(current, voltage) |
+==========================
+ NULL |
+ NULL |
+ 3 |
+
+taos> select LEAST(current, voltage, '15') from ts_4893.n1;
+ least(current, voltage, '15') |
+================================
+ NULL |
+ NULL |
+ 3 |
+
diff --git a/tests/army/query/function/ans/max.csv b/tests/army/query/function/ans/max.csv
index 40f8b2ac23..e13a26847b 100644
--- a/tests/army/query/function/ans/max.csv
+++ b/tests/army/query/function/ans/max.csv
@@ -576,7 +576,7 @@ taos> select max(total_voltage) from (select sum(voltage) as total_voltage from
taos> select round(max(current), 2) from ts_4893.meters
round(max(current), 2) |
=========================
- 1.2000000e+01 |
+ 12 |
taos> select pow(max(current), 2) from ts_4893.meters
pow(max(current), 2) |
@@ -651,7 +651,7 @@ taos> select max(cast(10000000000 as bigint unsigned))
taos> select max(cast(1.1 as float))
max(cast(1.1 as float)) |
==========================
- 1.1000000e+00 |
+ 1.1 |
taos> select max(cast(1.1 as double))
max(cast(1.1 as double)) |
diff --git a/tests/army/query/function/ans/min.csv b/tests/army/query/function/ans/min.csv
index d77744a4f9..6426276446 100644
--- a/tests/army/query/function/ans/min.csv
+++ b/tests/army/query/function/ans/min.csv
@@ -576,7 +576,7 @@ taos> select min(total_voltage) from (select sum(voltage) as total_voltage from
taos> select round(min(current), 2) from ts_4893.meters
round(min(current), 2) |
=========================
- 8.0000000e+00 |
+ 8 |
taos> select pow(min(current), 2) from ts_4893.meters
pow(min(current), 2) |
@@ -651,7 +651,7 @@ taos> select min(cast(10000000000 as bigint unsigned))
taos> select min(cast(1.1 as float))
min(cast(1.1 as float)) |
==========================
- 1.1000000e+00 |
+ 1.1 |
taos> select min(cast(1.1 as double))
min(cast(1.1 as double)) |
diff --git a/tests/army/query/function/ans/mod.csv b/tests/army/query/function/ans/mod.csv
index 9d2232f49d..c222257308 100644
--- a/tests/army/query/function/ans/mod.csv
+++ b/tests/army/query/function/ans/mod.csv
@@ -42,26 +42,26 @@ taos> select MOD(10.55, 1) + 1
taos> select MOD(MOD(MOD(MOD(MOD(MOD(MOD(123.123456789, 9), 8), 7), 6), 5), 4), 3)
mod(mod(mod(mod(mod(mod(mod(123.123456789, 9), 8), 7), 6), 5), 4 |
===================================================================
- 1.234567890000022e-01 |
+ 0.123456789000002 |
taos> select MOD(MOD(MOD(MOD(MOD(MOD(MOD(123456789.123456789, -1), -2), -3), -4), -5), -6), -7)
mod(mod(mod(mod(mod(mod(mod(123456789.123456789, -1), -2), -3), |
===================================================================
- 1.234567910432816e-01 |
+ 0.123456791043282 |
taos> select MOD(87654321.123456789, id + 1) from ts_4893.meters order by ts limit 10
mod(87654321.123456789, id + 1) |
==================================
- 1.234567910432816e-01 |
- 1.123456791043282e+00 |
- 1.234567910432816e-01 |
- 1.123456791043282e+00 |
- 1.123456791043282e+00 |
- 3.123456791043282e+00 |
- 6.123456791043282e+00 |
- 1.123456791043282e+00 |
- 1.234567910432816e-01 |
- 1.123456791043282e+00 |
+ 0.123456791043282 |
+ 1.12345679104328 |
+ 0.123456791043282 |
+ 1.12345679104328 |
+ 1.12345679104328 |
+ 3.12345679104328 |
+ 6.12345679104328 |
+ 1.12345679104328 |
+ 0.123456791043282 |
+ 1.12345679104328 |
taos> select MOD(current, id + 1) from ts_4893.meters order by ts limit 10
mod(current, id + 1) |
@@ -94,16 +94,16 @@ taos> select MOD(current, 1) from ts_4893.meters order by ts limit 10
taos> select MOD(sqrt(current), abs(id + 1)) from ts_4893.meters order by ts limit 10
mod(sqrt(current), abs(id + 1)) |
==================================
- 2.634337159700784e-01 |
- 9.281394021770111e-01 |
- 1.296964830944782e-01 |
- 3.351566768190027e+00 |
- 3.272002495118848e+00 |
- 2.916847677517688e+00 |
- 3.097741066924800e+00 |
- 3.310891102586806e+00 |
- 3.350522322288470e+00 |
- 3.215120509901375e+00 |
+ 0.263433715970078 |
+ 0.928139402177011 |
+ 0.129696483094478 |
+ 3.35156676819003 |
+ 3.27200249511885 |
+ 2.91684767751769 |
+ 3.0977410669248 |
+ 3.31089110258681 |
+ 3.35052232228847 |
+ 3.21512050990137 |
taos> select mod(10, -3)
mod(10, -3) |
diff --git a/tests/army/query/function/ans/pi.csv b/tests/army/query/function/ans/pi.csv
index fb7d662ca3..a364f472c6 100644
--- a/tests/army/query/function/ans/pi.csv
+++ b/tests/army/query/function/ans/pi.csv
@@ -190,5 +190,5 @@ taos> select voltage / pi() from ts_4893.meters limit 1
taos> select id, case when voltage > 100 then pi() else pi() / 2 end from ts_4893.meters limit 1
id | case when voltage > 100 then pi() else pi() / 2 end |
====================================================================
- 0 | 3.141592653589793e+00 |
+ 0 | 3.14159265358979 |
diff --git a/tests/army/query/function/ans/position.csv b/tests/army/query/function/ans/position.csv
index 1547564322..8e082ef574 100644
--- a/tests/army/query/function/ans/position.csv
+++ b/tests/army/query/function/ans/position.csv
@@ -201,7 +201,7 @@ taos> select ABS(POSITION('aaa' IN 'aaaaaaaaa'))
taos> select POW(POSITION('aaa' IN 'aaaaaaaaa'), 2)
pow(position('aaa' in 'aaaaaaaaa'), 2) |
=========================================
- 1.000000000000000e+00 |
+ 1 |
taos> select position('t' in 'taos')
position('t' in 'taos') |
diff --git a/tests/army/query/function/ans/rand.csv b/tests/army/query/function/ans/rand.csv
index 2e87f3404f..5685bd901e 100644
--- a/tests/army/query/function/ans/rand.csv
+++ b/tests/army/query/function/ans/rand.csv
@@ -50,12 +50,12 @@ taos> select rand(-1)
taos> select rand(12345678901234567890)
rand(12345678901234567890) |
=============================
- 2.008294813338805e-01 |
+ 0.20082948133388 |
taos> select rand(-12345678901234567890)
rand(-12345678901234567890) |
==============================
- 8.401877171547095e-01 |
+ 0.84018771715471 |
taos> select rand(12345), rand(12345)
rand(12345) | rand(12345) |
diff --git a/tests/army/query/function/ans/round.csv b/tests/army/query/function/ans/round.csv
index 2c185abd73..4ae3a85376 100644
--- a/tests/army/query/function/ans/round.csv
+++ b/tests/army/query/function/ans/round.csv
@@ -67,12 +67,12 @@ taos> select ROUND(10.55, 1) + 1
taos> select ROUND(ROUND(ROUND(ROUND(ROUND(ROUND(ROUND(123.123456789, 9), 8), 7), 6), 5), 4))
round(round(round(round(round(round(round(123.123456789, 9), 8), |
===================================================================
- 1.230000000000000e+02 |
+ 123 |
taos> select ROUND(ROUND(ROUND(ROUND(ROUND(ROUND(ROUND(123456789.123456789, -1), -2), -3), -4), -5), -6))
round(round(round(round(round(round(round(123456789.123456789, - |
===================================================================
- 1.230000000000000e+08 |
+ 123000000 |
taos> select ROUND(current) from ts_4893.meters order by ts limit 20
round(current) |
@@ -101,16 +101,16 @@ taos> select ROUND(current) from ts_4893.meters order by ts limit 20
taos> select ROUND(87654321.123456789, id) from ts_4893.meters order by ts limit 10
round(87654321.123456789, id) |
================================
- 8.765432100000000e+07 |
- 8.765432109999999e+07 |
- 8.765432112000000e+07 |
- 8.765432112300000e+07 |
- 8.765432112350000e+07 |
- 8.765432112345999e+07 |
- 8.765432112345700e+07 |
- 8.765432112345681e+07 |
- 8.765432112345679e+07 |
- 8.765432112345679e+07 |
+ 87654321 |
+ 87654321.1 |
+ 87654321.12 |
+ 87654321.123 |
+ 87654321.1235 |
+ 87654321.12346 |
+ 87654321.123457 |
+ 87654321.1234568 |
+ 87654321.1234568 |
+ 87654321.1234568 |
taos> select ROUND(current, id) from ts_4893.meters order by ts limit 10
round(current, id) |
@@ -286,7 +286,7 @@ taos> select round(voltage, -1) from ts_4893.meters limit 1
taos> select round(current * voltage, 2) from ts_4893.meters limit 1
round(current * voltage, 2) |
==============================
- 2.353650000000000e+03 |
+ 2353.65 |
taos> select round(abs(voltage), 2) from ts_4893.meters limit 1
round(abs(voltage), 2) |
diff --git a/tests/army/query/function/ans/sign.csv b/tests/army/query/function/ans/sign.csv
index f8fc961c2b..700e88fde6 100644
--- a/tests/army/query/function/ans/sign.csv
+++ b/tests/army/query/function/ans/sign.csv
@@ -164,7 +164,7 @@ taos> select sign(cast(1 as bigint unsigned))
taos> select sign(cast(1 as float))
sign(cast(1 as float)) |
=========================
- 1.0000000e+00 |
+ 1 |
taos> select sign(cast(1 as double))
sign(cast(1 as double)) |
@@ -316,30 +316,30 @@ taos> select sign(current) from ts_4893.meters order by ts limit 10
taos> select sign(cast(current as float)) from ts_4893.d0 order by ts limit 10
sign(cast(current as float)) |
===============================
- 1.0000000e+00 |
- 1.0000000e+00 |
- 1.0000000e+00 |
- 1.0000000e+00 |
- 1.0000000e+00 |
- 1.0000000e+00 |
- 1.0000000e+00 |
- 1.0000000e+00 |
- 1.0000000e+00 |
- 1.0000000e+00 |
+ 1 |
+ 1 |
+ 1 |
+ 1 |
+ 1 |
+ 1 |
+ 1 |
+ 1 |
+ 1 |
+ 1 |
taos> select sign(cast(current as float)) from ts_4893.meters order by ts limit 10
sign(cast(current as float)) |
===============================
- 1.0000000e+00 |
- 1.0000000e+00 |
- 1.0000000e+00 |
- 1.0000000e+00 |
- 1.0000000e+00 |
- 1.0000000e+00 |
- 1.0000000e+00 |
- 1.0000000e+00 |
- 1.0000000e+00 |
- 1.0000000e+00 |
+ 1 |
+ 1 |
+ 1 |
+ 1 |
+ 1 |
+ 1 |
+ 1 |
+ 1 |
+ 1 |
+ 1 |
taos> select sign(null)
sign(null) |
diff --git a/tests/army/query/function/ans/stddev.csv b/tests/army/query/function/ans/stddev.csv
index c0f93a9bcd..02f83a7742 100644
--- a/tests/army/query/function/ans/stddev.csv
+++ b/tests/army/query/function/ans/stddev.csv
@@ -109,17 +109,17 @@ taos> select stddev_pop(total_voltage) from (select sum(voltage) as total_voltag
taos> select round(stddev_pop(current), 2) from ts_4893.meters
round(stddev_pop(current), 2) |
================================
- 1.150000000000000e+00 |
+ 1.15 |
taos> select pow(stddev_pop(current), 2) from ts_4893.meters
pow(stddev_pop(current), 2) |
==============================
- 1.332500071133751e+00 |
+ 1.33250007113375 |
taos> select log(stddev_pop(voltage) + 1) from ts_4893.meters
log(stddev_pop(voltage) + 1) |
===============================
- 1.354922290183882e+00 |
+ 1.35492229018388 |
taos> select groupid, stddev_pop(voltage) from ts_4893.meters group by groupid order by groupid
groupid | stddev_pop(voltage) |
diff --git a/tests/army/query/function/ans/trunc.csv b/tests/army/query/function/ans/trunc.csv
index 15411afbf3..8d1316b760 100644
--- a/tests/army/query/function/ans/trunc.csv
+++ b/tests/army/query/function/ans/trunc.csv
@@ -47,40 +47,40 @@ taos> select TRUNCATE(10.55, 1) + 1
taos> select TRUNCATE(TRUNCATE(TRUNCATE(TRUNCATE(TRUNCATE(TRUNCATE(TRUNCATE(123.123456789, 9), 8), 7), 6), 5), 4), 3)
truncate(truncate(truncate(truncate(truncate(truncate(truncate(1 |
===================================================================
- 1.231230000000000e+02 |
+ 123.123 |
taos> select TRUNCATE(TRUNCATE(TRUNCATE(TRUNCATE(TRUNCATE(TRUNCATE(TRUNCATE(123456789.123456789, -1), -2), -3), -4), -5), -6), -7)
truncate(truncate(truncate(truncate(truncate(truncate(truncate(1 |
===================================================================
- 1.200000000000000e+08 |
+ 120000000 |
taos> select TRUNCATE(87654321.123456789, id) from ts_4893.meters order by ts limit 10
truncate(87654321.123456789, id) |
===================================
- 8.765432100000000e+07 |
- 8.765432109999999e+07 |
- 8.765432112000000e+07 |
- 8.765432112300000e+07 |
- 8.765432112340000e+07 |
- 8.765432112345000e+07 |
- 8.765432112345600e+07 |
- 8.765432112345670e+07 |
- 8.765432112345679e+07 |
- 8.765432112345679e+07 |
+ 87654321 |
+ 87654321.1 |
+ 87654321.12 |
+ 87654321.123 |
+ 87654321.1234 |
+ 87654321.12345 |
+ 87654321.123456 |
+ 87654321.1234567 |
+ 87654321.1234568 |
+ 87654321.1234568 |
taos> select TRUNCATE(current, id) from ts_4893.meters order by ts limit 10
truncate(current, id) |
========================
- 1.0000000e+01 |
- 8.5000000e+00 |
- 9.7900000e+00 |
- 1.1233000e+01 |
- 1.0706000e+01 |
- 8.5080004e+00 |
- 9.5959997e+00 |
- 1.0962000e+01 |
- 1.1226000e+01 |
- 1.0337000e+01 |
+ 10 |
+ 8.5 |
+ 9.79 |
+ 11.233 |
+ 10.706 |
+ 8.508 |
+ 9.596 |
+ 10.962 |
+ 11.226 |
+ 10.337 |
taos> select TRUNCATE(current, 1) from ts_4893.meters order by ts limit 10
truncate(current, 1) |
@@ -144,26 +144,26 @@ taos> select TRUNC(10.55, 1) + 1
taos> select TRUNC(TRUNC(TRUNC(TRUNC(TRUNC(TRUNC(TRUNC(123.123456789, 9), 8), 7), 6), 5), 4), 3)
trunc(trunc(trunc(trunc(trunc(trunc(trunc(123.123456789, 9), 8), |
===================================================================
- 1.231230000000000e+02 |
+ 123.123 |
taos> select TRUNC(TRUNC(TRUNC(TRUNC(TRUNC(TRUNC(TRUNC(123456789.123456789, -1), -2), -3), -4), -5), -6), -7)
trunc(trunc(trunc(trunc(trunc(trunc(trunc(123456789.123456789, - |
===================================================================
- 1.200000000000000e+08 |
+ 120000000 |
taos> select TRUNC(87654321.123456789, id) from ts_4893.meters order by ts limit 10
trunc(87654321.123456789, id) |
================================
- 8.765432100000000e+07 |
- 8.765432109999999e+07 |
- 8.765432112000000e+07 |
- 8.765432112300000e+07 |
- 8.765432112340000e+07 |
- 8.765432112345000e+07 |
- 8.765432112345600e+07 |
- 8.765432112345670e+07 |
- 8.765432112345679e+07 |
- 8.765432112345679e+07 |
+ 87654321 |
+ 87654321.1 |
+ 87654321.12 |
+ 87654321.123 |
+ 87654321.1234 |
+ 87654321.12345 |
+ 87654321.123456 |
+ 87654321.1234567 |
+ 87654321.1234568 |
+ 87654321.1234568 |
taos> select TRUNC(current, id) from ts_4893.meters order by ts limit 10
trunc(current, id) |
@@ -289,7 +289,7 @@ taos> select truncate(100.9876, 2)
taos> select truncate(99999999999999.9999, 2)
truncate(99999999999999.9999, 2) |
===================================
- 1.000000000000000e+14 |
+ 100000000000000 |
taos> select truncate(-5.678, 2)
truncate(-5.678, 2) |
@@ -314,7 +314,7 @@ taos> select truncate(phase, 3) from ts_4893.meters limit 1
taos> select truncate(voltage + current, 2) from ts_4893.meters limit 1
truncate(voltage + current, 2) |
=================================
- 2.316400000000000e+02 |
+ 231.64 |
taos> select truncate(voltage, -1) from ts_4893.meters limit 1
truncate(voltage, -1) |
@@ -329,7 +329,7 @@ taos> select round(truncate(voltage, 1), 2) from ts_4893.meters limit 1
taos> select truncate(abs(current), 1) from ts_4893.meters limit 1
truncate(abs(current), 1) |
============================
- 1.0600000e+01 |
+ 10.6 |
taos> select truncate(exp(phase), 2) from ts_4893.meters limit 1
truncate(exp(phase), 2) |
diff --git a/tests/army/query/function/ans/varpop.csv b/tests/army/query/function/ans/varpop.csv
index 829996d978..ec5d479f3a 100644
--- a/tests/army/query/function/ans/varpop.csv
+++ b/tests/army/query/function/ans/varpop.csv
@@ -99,7 +99,7 @@ taos> select var_pop(total_voltage) from (select sum(voltage) as total_voltage f
taos> select round(var_pop(current), 2) from ts_4893.meters
round(var_pop(current), 2) |
=============================
- 1.330000000000000e+00 |
+ 1.33 |
taos> select pow(var_pop(current), 2) from ts_4893.meters
pow(var_pop(current), 2) |
diff --git a/tests/army/query/function/in/greatest.in b/tests/army/query/function/in/greatest.in
new file mode 100644
index 0000000000..098ef626e9
--- /dev/null
+++ b/tests/army/query/function/in/greatest.in
@@ -0,0 +1,232 @@
+alter local 'compareAsStrInGreatest' '1';
+select GREATEST(1,2,3,4,5,6,7,8,9,10);
+select GREATEST(1,1.1,2.23,3.4444,5.66666666,6.21241241,7.999999999999);
+select GREATEST(1,'2',3.3,4.4,5);
+select GREATEST(121,'18');
+select GREATEST(18888,'18');
+select GREATEST(1,2,3,4,5,'5.1');
+select GREATEST('1','2','3','4',5);
+select GREATEST('1','2','3','4','5');
+select GREATEST(1,2,3,4,5,6,7,'a','b','一','二','三');
+select GREATEST(1,2,3,4,5,6,7,'a','b','c','1','2','1231213');
+select GREATEST(1,2,3,4,5,6,7,'a','b','c','1','2','1231213','1231213.123123');
+select GREATEST(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), cast(3 as int), cast(4 as bigint), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)));
+select GREATEST(cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as smallint unsigned), cast(3 as int unsigned), cast(4 as bigint unsigned), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)));
+select GREATEST(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), cast(3 as int), cast(4 as bigint), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)), cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as smallint unsigned), cast(3 as int unsigned), cast(4 as bigint unsigned), cast(5 as float), cast(6 as double));
+select GREATEST(cast(100 as tinyint), cast(101 as tinyint));
+select GREATEST(cast(100 as tinyint), cast(101 as smallint));
+select GREATEST(cast(100 as tinyint), cast(101 as int));
+select GREATEST(cast(100 as tinyint), cast(101 as bigint));
+select GREATEST(cast(100 as tinyint), cast(101 as float));
+select GREATEST(cast(100 as tinyint), cast(101 as double));
+select GREATEST(cast(100 as tinyint), cast(101 as varchar(20)));
+select GREATEST(cast(100 as tinyint), cast(101 as nchar(20)));
+select GREATEST(cast(101 as tinyint), cast(100 as tinyint));
+select GREATEST(cast(101 as tinyint), cast(100 as smallint));
+select GREATEST(cast(101 as tinyint), cast(100 as int));
+select GREATEST(cast(101 as tinyint), cast(100 as bigint));
+select GREATEST(cast(101 as tinyint), cast(100 as float));
+select GREATEST(cast(101 as tinyint), cast(100 as double));
+select GREATEST(cast(101 as tinyint), cast(100 as varchar(20)));
+select GREATEST(cast(101 as tinyint), cast(100 as nchar(20)));
+select GREATEST(cast(1000 as smallint), cast(1001 as smallint));
+select GREATEST(cast(1000 as smallint), cast(1001 as int));
+select GREATEST(cast(1000 as smallint), cast(1001 as bigint));
+select GREATEST(cast(1000 as smallint), cast(1001 as float));
+select GREATEST(cast(1000 as smallint), cast(1001 as double));
+select GREATEST(cast(1000 as smallint), cast(1001 as varchar(20)));
+select GREATEST(cast(1000 as smallint), cast(1001 as nchar(20)));
+select GREATEST(cast(1001 as smallint), cast(1000 as smallint));
+select GREATEST(cast(1001 as smallint), cast(1000 as int));
+select GREATEST(cast(1001 as smallint), cast(1000 as bigint));
+select GREATEST(cast(1001 as smallint), cast(1000 as float));
+select GREATEST(cast(1001 as smallint), cast(1000 as double));
+select GREATEST(cast(1001 as smallint), cast(1000 as varchar(20)));
+select GREATEST(cast(1001 as smallint), cast(1000 as nchar(20)));
+select GREATEST(cast(1000000 as int), cast(1000001 as int));
+select GREATEST(cast(1000000 as int), cast(1000001 as bigint));
+select GREATEST(cast(1000000 as int), cast(1000001 as float));
+select GREATEST(cast(1000000 as int), cast(1000001 as double));
+select GREATEST(cast(1000000 as int), cast(1000001 as varchar(20)));
+select GREATEST(cast(1000000 as int), cast(1000001 as nchar(20)));
+select GREATEST(cast(1000001 as int), cast(1000000 as int));
+select GREATEST(cast(1000001 as int), cast(1000000 as bigint));
+select GREATEST(cast(1000001 as int), cast(1000000 as float));
+select GREATEST(cast(1000001 as int), cast(1000000 as double));
+select GREATEST(cast(1000001 as int), cast(1000000 as varchar(20)));
+select GREATEST(cast(1000001 as int), cast(1000000 as nchar(20)));
+select GREATEST(cast(1000000000 as bigint), cast(1000000001 as bigint));
+select GREATEST(cast(1000000000 as bigint), cast(1000000001 as float));
+select GREATEST(cast(1000000000 as bigint), cast(1000000001 as double));
+select GREATEST(cast(1000000000 as bigint), cast(1000000001 as varchar(20)));
+select GREATEST(cast(1000000000 as bigint), cast(1000000001 as nchar(20)));
+select GREATEST(cast(1000000001 as bigint), cast(1000000000 as bigint));
+select GREATEST(cast(1000000001 as bigint), cast(1000000000 as float));
+select GREATEST(cast(1000000001 as bigint), cast(1000000000 as double));
+select GREATEST(cast(1000000001 as bigint), cast(1000000000 as varchar(20)));
+select GREATEST(cast(1000000001 as bigint), cast(1000000000 as nchar(20)));
+select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as float));
+select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as double));
+select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as timestamp));
+select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as varchar(20)));
+select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as nchar(20)));
+select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as float));
+select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as double));
+select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as timestamp));
+select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as varchar(20)));
+select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as nchar(20)));
+select GREATEST(cast(100000.1111111 as double), cast(100001.1111111 as double));
+select GREATEST(cast(100000.1111111 as double), cast(100001.1111111 as timestamp));
+select GREATEST(cast(100000.1111111 as double), cast(100001.1111111 as varchar(20)));
+select GREATEST(cast(100000.1111111 as double), cast(100001.1111111 as nchar(20)));
+select GREATEST(cast(100001.1111111 as double), cast(100000.1111111 as double));
+select GREATEST(cast(100001.1111111 as double), cast(100000.1111111 as timestamp));
+select GREATEST(cast(100001.1111111 as double), cast(100000.1111111 as varchar(20)));
+select GREATEST(cast(100001.1111111 as double), cast(100000.1111111 as nchar(20)));
+select GREATEST(cast('中文测试' as varchar(20)), cast('中文测试一' as varchar(20)));
+select GREATEST(cast('中文测试' as varchar(20)), cast('中文测试一' as nchar(20)));
+select GREATEST(cast('中文测试一' as varchar(20)), cast('中文测试' as varchar(20)));
+select GREATEST(cast('中文测试一' as varchar(20)), cast('中文测试' as nchar(20)));
+select GREATEST(cast('abc123abc' as varchar(20)), cast('abc124abc' as varchar(20)));
+select GREATEST(cast('abc123abc' as varchar(20)), cast('abc124abc' as nchar(20)));
+select GREATEST(cast('abc124abc' as varchar(20)), cast('abc123abc' as varchar(20)));
+select GREATEST(cast('abc124abc' as varchar(20)), cast('abc123abc' as nchar(20)));
+select GREATEST(cast('abc123abc' as nchar(20)), cast('abc124abc' as nchar(20)));
+select GREATEST(cast(100 as tinyint), cast(101 as float), cast(102 as varchar(20)));
+select GREATEST(cast(100 as float), cast(101 as tinyint), cast(102 as varchar(20)));
+select GREATEST(cast(100 as float), cast(101 as varchar(20)), cast(102 as tinyint));
+select GREATEST(cast(100 as varchar(20)), cast(101 as float), cast(102 as tinyint));
+select GREATEST('a','b','c','d','e','f','g','h','1231','15155');
+select GREATEST(current, voltage, phase, id, nch1, nch2, var1, var2) from ts_4893.meters order by ts limit 10;
+select GREATEST(current, voltage, phase, id) from ts_4893.meters order by ts limit 10;
+select GREATEST(nch1, nch2, var1, var2) from ts_4893.meters order by ts limit 10;
+select GREATEST(221, voltage) from ts_4893.meters order by ts limit 10;
+select GREATEST(5, id) from ts_4893.meters order by ts limit 10;
+select GREATEST('r', nch1) from ts_4893.meters order by ts limit 10;
+select GREATEST('r', nch1, nch2) from ts_4893.meters order by ts limit 10;
+select GREATEST('r', var1) from ts_4893.meters order by ts limit 10;
+select GREATEST('r', var1, var2) from ts_4893.meters order by ts limit 10;
+select GREATEST('二中文测试', nch1) from ts_4893.meters order by ts limit 10;
+select GREATEST('二中文测试', nch1, nch2) from ts_4893.meters order by ts limit 10;
+select GREATEST('二中文测试', var1) from ts_4893.meters order by ts limit 10;
+select GREATEST('二中文测试', var1, var2) from ts_4893.meters order by ts limit 10;
+select GREATEST('23', 3443434343434343);
+select GREATEST(co, 3443434343434343) from ts_4893.n1;
+select GREATEST('23', 3443434343434343) from ts_4893.n1;
+select GREATEST('23', 1443434343434343) from ts_4893.n1;
+select GREATEST(current, voltage) from ts_4893.n1;
+select GREATEST(current, voltage, '15') from ts_4893.n1;
+alter local 'compareAsStrInGreatest' '0';
+select GREATEST(1,'2',3.3,4.4,5);
+select GREATEST(1,2,3,4,5,'5.1');
+select GREATEST(121,'18');
+select GREATEST('1','2','3','4','5');
+select GREATEST(1,2,3,4,5,6,7,'a','b','一','二','三');
+select GREATEST(1,2,3,4,5,6,7,'a','b','c','1','2','1231213');
+select GREATEST(1,2,3,4,5,6,7,'a','b','c','1','2','1231213','1231213.123123');
+select GREATEST(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), cast(3 as int), cast(4 as bigint), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)));
+select GREATEST(cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as smallint unsigned), cast(3 as int unsigned), cast(4 as bigint unsigned), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)));
+select GREATEST(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), cast(3 as int), cast(4 as bigint), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)), cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as smallint unsigned), cast(3 as int unsigned), cast(4 as bigint unsigned), cast(5 as float), cast(6 as double));
+select GREATEST(cast(100 as tinyint), cast(101 as tinyint));
+select GREATEST(cast(100 as tinyint), cast(101 as smallint));
+select GREATEST(cast(100 as tinyint), cast(101 as int));
+select GREATEST(cast(100 as tinyint), cast(101 as bigint));
+select GREATEST(cast(100 as tinyint), cast(101 as float));
+select GREATEST(cast(100 as tinyint), cast(101 as double));
+select GREATEST(cast(100 as tinyint), cast(101 as varchar(20)));
+select GREATEST(cast(100 as tinyint), cast(101 as nchar(20)));
+select GREATEST(cast(101 as tinyint), cast(100 as tinyint));
+select GREATEST(cast(101 as tinyint), cast(100 as smallint));
+select GREATEST(cast(101 as tinyint), cast(100 as int));
+select GREATEST(cast(101 as tinyint), cast(100 as bigint));
+select GREATEST(cast(101 as tinyint), cast(100 as float));
+select GREATEST(cast(101 as tinyint), cast(100 as double));
+select GREATEST(cast(101 as tinyint), cast(100 as varchar(20)));
+select GREATEST(cast(101 as tinyint), cast(100 as nchar(20)));
+select GREATEST(cast(1000 as smallint), cast(1001 as smallint));
+select GREATEST(cast(1000 as smallint), cast(1001 as int));
+select GREATEST(cast(1000 as smallint), cast(1001 as bigint));
+select GREATEST(cast(1000 as smallint), cast(1001 as float));
+select GREATEST(cast(1000 as smallint), cast(1001 as double));
+select GREATEST(cast(1000 as smallint), cast(1001 as varchar(20)));
+select GREATEST(cast(1000 as smallint), cast(1001 as nchar(20)));
+select GREATEST(cast(1001 as smallint), cast(1000 as smallint));
+select GREATEST(cast(1001 as smallint), cast(1000 as int));
+select GREATEST(cast(1001 as smallint), cast(1000 as bigint));
+select GREATEST(cast(1001 as smallint), cast(1000 as float));
+select GREATEST(cast(1001 as smallint), cast(1000 as double));
+select GREATEST(cast(1001 as smallint), cast(1000 as varchar(20)));
+select GREATEST(cast(1001 as smallint), cast(1000 as nchar(20)));
+select GREATEST(cast(1000000 as int), cast(1000001 as int));
+select GREATEST(cast(1000000 as int), cast(1000001 as bigint));
+select GREATEST(cast(1000000 as int), cast(1000001 as float));
+select GREATEST(cast(1000000 as int), cast(1000001 as double));
+select GREATEST(cast(1000000 as int), cast(1000001 as varchar(20)));
+select GREATEST(cast(1000000 as int), cast(1000001 as nchar(20)));
+select GREATEST(cast(1000001 as int), cast(1000000 as int));
+select GREATEST(cast(1000001 as int), cast(1000000 as bigint));
+select GREATEST(cast(1000001 as int), cast(1000000 as float));
+select GREATEST(cast(1000001 as int), cast(1000000 as double));
+select GREATEST(cast(1000001 as int), cast(1000000 as varchar(20)));
+select GREATEST(cast(1000001 as int), cast(1000000 as nchar(20)));
+select GREATEST(cast(1000000000 as bigint), cast(1000000001 as bigint));
+select GREATEST(cast(1000000000 as bigint), cast(1000000001 as float));
+select GREATEST(cast(1000000000 as bigint), cast(1000000001 as double));
+select GREATEST(cast(1000000000 as bigint), cast(1000000001 as varchar(20)));
+select GREATEST(cast(1000000000 as bigint), cast(1000000001 as nchar(20)));
+select GREATEST(cast(1000000001 as bigint), cast(1000000000 as bigint));
+select GREATEST(cast(1000000001 as bigint), cast(1000000000 as float));
+select GREATEST(cast(1000000001 as bigint), cast(1000000000 as double));
+select GREATEST(cast(1000000001 as bigint), cast(1000000000 as varchar(20)));
+select GREATEST(cast(1000000001 as bigint), cast(1000000000 as nchar(20)));
+select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as float));
+select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as double));
+select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as timestamp));
+select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as varchar(20)));
+select GREATEST(cast(100000.1111111 as float), cast(100001.1111111 as nchar(20)));
+select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as float));
+select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as double));
+select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as timestamp));
+select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as varchar(20)));
+select GREATEST(cast(100001.1111111 as float), cast(100000.1111111 as nchar(20)));
+select GREATEST(cast(100000.1111111 as double), cast(100001.1111111 as double));
+select GREATEST(cast(100000.1111111 as double), cast(100001.1111111 as timestamp));
+select GREATEST(cast(100000.1111111 as double), cast(100001.1111111 as varchar(20)));
+select GREATEST(cast(100000.1111111 as double), cast(100001.1111111 as nchar(20)));
+select GREATEST(cast(100001.1111111 as double), cast(100000.1111111 as double));
+select GREATEST(cast(100001.1111111 as double), cast(100000.1111111 as timestamp));
+select GREATEST(cast(100001.1111111 as double), cast(100000.1111111 as varchar(20)));
+select GREATEST(cast(100001.1111111 as double), cast(100000.1111111 as nchar(20)));
+select GREATEST(cast('中文测试' as varchar(20)), cast('中文测试一' as varchar(20)));
+select GREATEST(cast('中文测试' as varchar(20)), cast('中文测试一' as nchar(20)));
+select GREATEST(cast('中文测试一' as varchar(20)), cast('中文测试' as varchar(20)));
+select GREATEST(cast('中文测试一' as varchar(20)), cast('中文测试' as nchar(20)));
+select GREATEST(cast('abc123abc' as varchar(20)), cast('abc124abc' as varchar(20)));
+select GREATEST(cast('abc123abc' as varchar(20)), cast('abc124abc' as nchar(20)));
+select GREATEST(cast('abc124abc' as varchar(20)), cast('abc123abc' as varchar(20)));
+select GREATEST(cast('abc124abc' as varchar(20)), cast('abc123abc' as nchar(20)));
+select GREATEST(cast('abc123abc' as nchar(20)), cast('abc124abc' as nchar(20)));
+select GREATEST(cast(100 as tinyint), cast(101 as float), cast(102 as varchar(20)));
+select GREATEST(cast(100 as float), cast(101 as tinyint), cast(102 as varchar(20)));
+select GREATEST(cast(100 as float), cast(101 as varchar(20)), cast(102 as tinyint));
+select GREATEST(cast(100 as varchar(20)), cast(101 as float), cast(102 as tinyint));
+select GREATEST('a','b','c','d','e','f','g','h','1231','15155');
+select GREATEST(current, voltage, phase, id, nch1, nch2, var1, var2) from ts_4893.meters order by ts limit 10;
+select GREATEST(current, voltage, phase, id) from ts_4893.meters order by ts limit 10;
+select GREATEST(nch1, nch2, var1, var2) from ts_4893.meters order by ts limit 10;
+select GREATEST(221, voltage) from ts_4893.meters order by ts limit 10;
+select GREATEST(5, id) from ts_4893.meters order by ts limit 10;
+select GREATEST('r', nch1) from ts_4893.meters order by ts limit 10;
+select GREATEST('r', nch1, nch2) from ts_4893.meters order by ts limit 10;
+select GREATEST('r', var1) from ts_4893.meters order by ts limit 10;
+select GREATEST('r', var1, var2) from ts_4893.meters order by ts limit 10;
+select GREATEST('二中文测试', nch1) from ts_4893.meters order by ts limit 10;
+select GREATEST('二中文测试', nch1, nch2) from ts_4893.meters order by ts limit 10;
+select GREATEST('二中文测试', var1) from ts_4893.meters order by ts limit 10;
+select GREATEST('二中文测试', var1, var2) from ts_4893.meters order by ts limit 10;
+select GREATEST('23', 3443434343434343);
+select GREATEST(co, 3443434343434343) from ts_4893.n1;
+select GREATEST('23', 1443434343434343) from ts_4893.n1;
+select GREATEST('23', 3443434343434343) from ts_4893.n1
+select GREATEST(current, voltage) from ts_4893.n1;
+select GREATEST(current, voltage, '15') from ts_4893.n1;
\ No newline at end of file
diff --git a/tests/army/query/function/in/least.in b/tests/army/query/function/in/least.in
new file mode 100644
index 0000000000..946d00b59b
--- /dev/null
+++ b/tests/army/query/function/in/least.in
@@ -0,0 +1,228 @@
+alter local 'compareAsStrInGreatest' '1';
+select LEAST(1,2,3,4,5,6,7,8,9,10);
+select LEAST(1,1.1,2.23,3.4444,5.66666666,6.21241241,7.999999999999);
+select LEAST(1,'2',3.3,4.4,5);
+select LEAST(1,2,3,4,5,'5.1');
+select LEAST('1','2','3','4',5);
+select LEAST('1','2','3','4','5');
+select LEAST(1,2,3,4,5,6,7,'a','b','一','二','三');
+select LEAST(1,2,3,4,5,6,7,'a','b','c','1','2','1231213');
+select LEAST(1,2,3,4,5,6,7,'a','b','c','1','2','1231213','1231213.123123');
+select LEAST(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), cast(3 as int), cast(4 as bigint), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)));
+select LEAST(cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as smallint unsigned), cast(3 as int unsigned), cast(4 as bigint unsigned), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)));
+select LEAST(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), cast(3 as int), cast(4 as bigint), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)), cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as smallint unsigned), cast(3 as int unsigned), cast(4 as bigint unsigned), cast(5 as float), cast(6 as double));
+select LEAST(cast(100 as tinyint), cast(101 as tinyint));
+select LEAST(cast(100 as tinyint), cast(101 as smallint));
+select LEAST(cast(100 as tinyint), cast(101 as int));
+select LEAST(cast(100 as tinyint), cast(101 as bigint));
+select LEAST(cast(100 as tinyint), cast(101 as float));
+select LEAST(cast(100 as tinyint), cast(101 as double));
+select LEAST(cast(100 as tinyint), cast(101 as varchar(20)));
+select LEAST(cast(100 as tinyint), cast(101 as nchar(20)));
+select LEAST(cast(101 as tinyint), cast(100 as tinyint));
+select LEAST(cast(101 as tinyint), cast(100 as smallint));
+select LEAST(cast(101 as tinyint), cast(100 as int));
+select LEAST(cast(101 as tinyint), cast(100 as bigint));
+select LEAST(cast(101 as tinyint), cast(100 as float));
+select LEAST(cast(101 as tinyint), cast(100 as double));
+select LEAST(cast(101 as tinyint), cast(100 as varchar(20)));
+select LEAST(cast(101 as tinyint), cast(100 as nchar(20)));
+select LEAST(cast(1000 as smallint), cast(1001 as smallint));
+select LEAST(cast(1000 as smallint), cast(1001 as int));
+select LEAST(cast(1000 as smallint), cast(1001 as bigint));
+select LEAST(cast(1000 as smallint), cast(1001 as float));
+select LEAST(cast(1000 as smallint), cast(1001 as double));
+select LEAST(cast(1000 as smallint), cast(1001 as varchar(20)));
+select LEAST(cast(1000 as smallint), cast(1001 as nchar(20)));
+select LEAST(cast(1001 as smallint), cast(1000 as smallint));
+select LEAST(cast(1001 as smallint), cast(1000 as int));
+select LEAST(cast(1001 as smallint), cast(1000 as bigint));
+select LEAST(cast(1001 as smallint), cast(1000 as float));
+select LEAST(cast(1001 as smallint), cast(1000 as double));
+select LEAST(cast(1001 as smallint), cast(1000 as varchar(20)));
+select LEAST(cast(1001 as smallint), cast(1000 as nchar(20)));
+select LEAST(cast(1000000 as int), cast(1000001 as int));
+select LEAST(cast(1000000 as int), cast(1000001 as bigint));
+select LEAST(cast(1000000 as int), cast(1000001 as float));
+select LEAST(cast(1000000 as int), cast(1000001 as double));
+select LEAST(cast(1000000 as int), cast(1000001 as varchar(20)));
+select LEAST(cast(1000000 as int), cast(1000001 as nchar(20)));
+select LEAST(cast(1000001 as int), cast(1000000 as int));
+select LEAST(cast(1000001 as int), cast(1000000 as bigint));
+select LEAST(cast(1000001 as int), cast(1000000 as float));
+select LEAST(cast(1000001 as int), cast(1000000 as double));
+select LEAST(cast(1000001 as int), cast(1000000 as varchar(20)));
+select LEAST(cast(1000001 as int), cast(1000000 as nchar(20)));
+select LEAST(cast(1000000000 as bigint), cast(1000000001 as bigint));
+select LEAST(cast(1000000000 as bigint), cast(1000000001 as float));
+select LEAST(cast(1000000000 as bigint), cast(1000000001 as double));
+select LEAST(cast(1000000000 as bigint), cast(1000000001 as varchar(20)));
+select LEAST(cast(1000000000 as bigint), cast(1000000001 as nchar(20)));
+select LEAST(cast(1000000001 as bigint), cast(1000000000 as bigint));
+select LEAST(cast(1000000001 as bigint), cast(1000000000 as float));
+select LEAST(cast(1000000001 as bigint), cast(1000000000 as double));
+select LEAST(cast(1000000001 as bigint), cast(1000000000 as varchar(20)));
+select LEAST(cast(1000000001 as bigint), cast(1000000000 as nchar(20)));
+select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as float));
+select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as double));
+select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as timestamp));
+select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as varchar(20)));
+select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as nchar(20)));
+select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as float));
+select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as double));
+select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as timestamp));
+select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as varchar(20)));
+select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as nchar(20)));
+select LEAST(cast(100000.1111111 as double), cast(100001.1111111 as double));
+select LEAST(cast(100000.1111111 as double), cast(100001.1111111 as timestamp));
+select LEAST(cast(100000.1111111 as double), cast(100001.1111111 as varchar(20)));
+select LEAST(cast(100000.1111111 as double), cast(100001.1111111 as nchar(20)));
+select LEAST(cast(100001.1111111 as double), cast(100000.1111111 as double));
+select LEAST(cast(100001.1111111 as double), cast(100000.1111111 as timestamp));
+select LEAST(cast(100001.1111111 as double), cast(100000.1111111 as varchar(20)));
+select LEAST(cast(100001.1111111 as double), cast(100000.1111111 as nchar(20)));
+select LEAST(cast('中文测试' as varchar(20)), cast('中文测试一' as varchar(20)));
+select LEAST(cast('中文测试' as varchar(20)), cast('中文测试一' as nchar(20)));
+select LEAST(cast('中文测试一' as varchar(20)), cast('中文测试' as varchar(20)));
+select LEAST(cast('中文测试一' as varchar(20)), cast('中文测试' as nchar(20)));
+select LEAST(cast('abc123abc' as varchar(20)), cast('abc124abc' as varchar(20)));
+select LEAST(cast('abc123abc' as varchar(20)), cast('abc124abc' as nchar(20)));
+select LEAST(cast('abc124abc' as varchar(20)), cast('abc123abc' as varchar(20)));
+select LEAST(cast('abc124abc' as varchar(20)), cast('abc123abc' as nchar(20)));
+select LEAST(cast('abc123abc' as nchar(20)), cast('abc124abc' as nchar(20)));
+select LEAST(cast(100 as tinyint), cast(101 as float), cast(102 as varchar(20)));
+select LEAST(cast(100 as varchar(20)), cast(101 as float), cast(102 as tinyint));
+select LEAST('a','b','c','d','e','f','g','h','1231','15155');
+select LEAST(current, voltage, phase, id, nch1, nch2, var1, var2) from ts_4893.meters order by ts limit 10;
+select LEAST(current, voltage, phase, id) from ts_4893.meters order by ts limit 10;
+select LEAST(nch1, nch2, var1, var2) from ts_4893.meters order by ts limit 10;
+select LEAST(221, voltage) from ts_4893.meters order by ts limit 10;
+select LEAST(5, id) from ts_4893.meters order by ts limit 10;
+select LEAST('r', nch1) from ts_4893.meters order by ts limit 10;
+select LEAST('r', nch1, nch2) from ts_4893.meters order by ts limit 10;
+select LEAST('r', var1) from ts_4893.meters order by ts limit 10;
+select LEAST('r', var1, var2) from ts_4893.meters order by ts limit 10;
+select LEAST('二中文测试', nch1) from ts_4893.meters order by ts limit 10;
+select LEAST('二中文测试', nch1, nch2) from ts_4893.meters order by ts limit 10;
+select LEAST('二中文测试', var1) from ts_4893.meters order by ts limit 10;
+select LEAST('二中文测试', var1, var2) from ts_4893.meters order by ts limit 10;
+select LEAST('23', 3443434343434343);
+select LEAST(co, 3443434343434343) from ts_4893.n1;
+select LEAST('23', 3443434343434343) from ts_4893.n1;
+select LEAST('23', 1443434343434343) from ts_4893.n1;
+select LEAST(current, voltage) from ts_4893.n1;
+select LEAST(current, voltage, '15') from ts_4893.n1;
+alter local 'compareAsStrInGreatest' '0';
+select LEAST(1,2,3,4,5,6,7,8,9,10);
+select LEAST(1,1.1,2.23,3.4444,5.66666666,6.21241241,7.999999999999);
+select LEAST(1,'2',3.3,4.4,5);
+select LEAST(1,2,3,4,5,'5.1');
+select LEAST('1','2','3','4',5);
+select LEAST('1','2','3','4','5');
+select LEAST(1,2,3,4,5,6,7,'a','b','一','二','三');
+select LEAST(1,2,3,4,5,6,7,'a','b','c','1','2','1231213');
+select LEAST(1,2,3,4,5,6,7,'a','b','c','1','2','1231213','1231213.123123');
+select LEAST(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), cast(3 as int), cast(4 as bigint), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)));
+select LEAST(cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as smallint unsigned), cast(3 as int unsigned), cast(4 as bigint unsigned), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)));
+select LEAST(cast(0 as bool), cast(1 as tinyint), cast(2 as smallint), cast(3 as int), cast(4 as bigint), cast(5 as float), cast(6 as double), cast(8 as varchar(20)), cast(9 as nchar(20)), cast(0 as bool), cast(1 as tinyint unsigned), cast(2 as smallint unsigned), cast(3 as int unsigned), cast(4 as bigint unsigned), cast(5 as float), cast(6 as double));
+select LEAST(cast(100 as tinyint), cast(101 as tinyint));
+select LEAST(cast(100 as tinyint), cast(101 as smallint));
+select LEAST(cast(100 as tinyint), cast(101 as int));
+select LEAST(cast(100 as tinyint), cast(101 as bigint));
+select LEAST(cast(100 as tinyint), cast(101 as float));
+select LEAST(cast(100 as tinyint), cast(101 as double));
+select LEAST(cast(100 as tinyint), cast(101 as varchar(20)));
+select LEAST(cast(100 as tinyint), cast(101 as nchar(20)));
+select LEAST(cast(101 as tinyint), cast(100 as tinyint));
+select LEAST(cast(101 as tinyint), cast(100 as smallint));
+select LEAST(cast(101 as tinyint), cast(100 as int));
+select LEAST(cast(101 as tinyint), cast(100 as bigint));
+select LEAST(cast(101 as tinyint), cast(100 as float));
+select LEAST(cast(101 as tinyint), cast(100 as double));
+select LEAST(cast(101 as tinyint), cast(100 as varchar(20)));
+select LEAST(cast(101 as tinyint), cast(100 as nchar(20)));
+select LEAST(cast(1000 as smallint), cast(1001 as smallint));
+select LEAST(cast(1000 as smallint), cast(1001 as int));
+select LEAST(cast(1000 as smallint), cast(1001 as bigint));
+select LEAST(cast(1000 as smallint), cast(1001 as float));
+select LEAST(cast(1000 as smallint), cast(1001 as double));
+select LEAST(cast(1000 as smallint), cast(1001 as varchar(20)));
+select LEAST(cast(1000 as smallint), cast(1001 as nchar(20)));
+select LEAST(cast(1001 as smallint), cast(1000 as smallint));
+select LEAST(cast(1001 as smallint), cast(1000 as int));
+select LEAST(cast(1001 as smallint), cast(1000 as bigint));
+select LEAST(cast(1001 as smallint), cast(1000 as float));
+select LEAST(cast(1001 as smallint), cast(1000 as double));
+select LEAST(cast(1001 as smallint), cast(1000 as varchar(20)));
+select LEAST(cast(1001 as smallint), cast(1000 as nchar(20)));
+select LEAST(cast(1000000 as int), cast(1000001 as int));
+select LEAST(cast(1000000 as int), cast(1000001 as bigint));
+select LEAST(cast(1000000 as int), cast(1000001 as float));
+select LEAST(cast(1000000 as int), cast(1000001 as double));
+select LEAST(cast(1000000 as int), cast(1000001 as varchar(20)));
+select LEAST(cast(1000000 as int), cast(1000001 as nchar(20)));
+select LEAST(cast(1000001 as int), cast(1000000 as int));
+select LEAST(cast(1000001 as int), cast(1000000 as bigint));
+select LEAST(cast(1000001 as int), cast(1000000 as float));
+select LEAST(cast(1000001 as int), cast(1000000 as double));
+select LEAST(cast(1000001 as int), cast(1000000 as varchar(20)));
+select LEAST(cast(1000001 as int), cast(1000000 as nchar(20)));
+select LEAST(cast(1000000000 as bigint), cast(1000000001 as bigint));
+select LEAST(cast(1000000000 as bigint), cast(1000000001 as float));
+select LEAST(cast(1000000000 as bigint), cast(1000000001 as double));
+select LEAST(cast(1000000000 as bigint), cast(1000000001 as varchar(20)));
+select LEAST(cast(1000000000 as bigint), cast(1000000001 as nchar(20)));
+select LEAST(cast(1000000001 as bigint), cast(1000000000 as bigint));
+select LEAST(cast(1000000001 as bigint), cast(1000000000 as float));
+select LEAST(cast(1000000001 as bigint), cast(1000000000 as double));
+select LEAST(cast(1000000001 as bigint), cast(1000000000 as varchar(20)));
+select LEAST(cast(1000000001 as bigint), cast(1000000000 as nchar(20)));
+select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as float));
+select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as double));
+select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as timestamp));
+select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as varchar(20)));
+select LEAST(cast(100000.1111111 as float), cast(100001.1111111 as nchar(20)));
+select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as float));
+select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as double));
+select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as timestamp));
+select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as varchar(20)));
+select LEAST(cast(100001.1111111 as float), cast(100000.1111111 as nchar(20)));
+select LEAST(cast(100000.1111111 as double), cast(100001.1111111 as double));
+select LEAST(cast(100000.1111111 as double), cast(100001.1111111 as timestamp));
+select LEAST(cast(100000.1111111 as double), cast(100001.1111111 as varchar(20)));
+select LEAST(cast(100000.1111111 as double), cast(100001.1111111 as nchar(20)));
+select LEAST(cast(100001.1111111 as double), cast(100000.1111111 as double));
+select LEAST(cast(100001.1111111 as double), cast(100000.1111111 as timestamp));
+select LEAST(cast(100001.1111111 as double), cast(100000.1111111 as varchar(20)));
+select LEAST(cast(100001.1111111 as double), cast(100000.1111111 as nchar(20)));
+select LEAST(cast('中文测试' as varchar(20)), cast('中文测试一' as varchar(20)));
+select LEAST(cast('中文测试' as varchar(20)), cast('中文测试一' as nchar(20)));
+select LEAST(cast('中文测试一' as varchar(20)), cast('中文测试' as varchar(20)));
+select LEAST(cast('中文测试一' as varchar(20)), cast('中文测试' as nchar(20)));
+select LEAST(cast('abc123abc' as varchar(20)), cast('abc124abc' as varchar(20)));
+select LEAST(cast('abc123abc' as varchar(20)), cast('abc124abc' as nchar(20)));
+select LEAST(cast('abc124abc' as varchar(20)), cast('abc123abc' as varchar(20)));
+select LEAST(cast('abc124abc' as varchar(20)), cast('abc123abc' as nchar(20)));
+select LEAST(cast('abc123abc' as nchar(20)), cast('abc124abc' as nchar(20)));
+select LEAST(cast(100 as tinyint), cast(101 as float), cast(102 as varchar(20)));
+select LEAST(cast(100 as varchar(20)), cast(101 as float), cast(102 as tinyint));
+select LEAST('a','b','c','d','e','f','g','h','1231','15155');
+select LEAST(current, voltage, phase, id, nch1, nch2, var1, var2) from ts_4893.meters order by ts limit 10;
+select LEAST(current, voltage, phase, id) from ts_4893.meters order by ts limit 10;
+select LEAST(nch1, nch2, var1, var2) from ts_4893.meters order by ts limit 10;
+select LEAST(221, voltage) from ts_4893.meters order by ts limit 10;
+select LEAST(5, id) from ts_4893.meters order by ts limit 10;
+select LEAST('r', nch1) from ts_4893.meters order by ts limit 10;
+select LEAST('r', nch1, nch2) from ts_4893.meters order by ts limit 10;
+select LEAST('r', var1) from ts_4893.meters order by ts limit 10;
+select LEAST('r', var1, var2) from ts_4893.meters order by ts limit 10;
+select LEAST('二中文测试', nch1) from ts_4893.meters order by ts limit 10;
+select LEAST('二中文测试', nch1, nch2) from ts_4893.meters order by ts limit 10;
+select LEAST('二中文测试', var1) from ts_4893.meters order by ts limit 10;
+select LEAST('二中文测试', var1, var2) from ts_4893.meters order by ts limit 10;
+select LEAST('23', 3443434343434343);
+select LEAST(co, 3443434343434343) from ts_4893.n1;
+select LEAST('23', 3443434343434343) from ts_4893.n1;
+select LEAST('23', 1443434343434343) from ts_4893.n1;
+select LEAST(current, voltage) from ts_4893.n1;
+select LEAST(current, voltage, '15') from ts_4893.n1;
\ No newline at end of file
diff --git a/tests/army/query/function/test_function.py b/tests/army/query/function/test_function.py
index c583d08cec..27e54407cc 100644
--- a/tests/army/query/function/test_function.py
+++ b/tests/army/query/function/test_function.py
@@ -40,37 +40,10 @@ class TDTestCase(TBase):
"`var2` VARCHAR(50)) TAGS (`groupid` TINYINT, `location` VARCHAR(16));")
tdSql.execute("CREATE table d0 using meters tags(1, 'beijing')")
tdSql.execute("insert into d0 file '%s'" % datafile)
-
- def test_normal_query(self, testCase):
- # read sql from .sql file and execute
- tdLog.info(f"test normal query.")
- sqlFile = etool.curFile(__file__, f"in/{testCase}.in")
- ansFile = etool.curFile(__file__, f"ans/{testCase}.csv")
- with open(sqlFile, 'r') as sql_file:
- sql_statement = ''
- tdSql.csvLine = 0
- for line in sql_file:
- if not line.strip() or line.strip().startswith('--'):
- continue
-
- sql_statement += line.strip()
- if sql_statement.endswith(';'):
- sql_statement = sql_statement.rstrip(';')
- tdSql.checkDataCsvByLine(sql_statement, ansFile)
- sql_statement = ''
- err_file_path = etool.curFile(__file__, f"in/{testCase}.err")
- if not os.path.isfile(err_file_path):
- return None
- with open(err_file_path, 'r') as err_file:
- err_statement = ''
- for line in err_file:
- if not line.strip() or line.strip().startswith('--'):
- continue
-
- err_statement += line.strip()
- if err_statement.endswith(';'):
- tdSql.error(err_statement)
- err_statement = ''
+ tdSql.execute("CREATE TABLE `n1` (`ts` TIMESTAMP, `current` FLOAT, `voltage` INT, co NCHAR(10))")
+ tdSql.execute("insert into n1 values(now, 1, null, '23')")
+ tdSql.execute("insert into n1 values(now, null, 3, '23')")
+ tdSql.execute("insert into n1 values(now, 5, 3, '23')")
def test_normal_query_new(self, testCase):
# read sql from .sql file and execute
@@ -310,6 +283,223 @@ class TDTestCase(TBase):
tdSql.error("select * from (select to_iso8601(ts, timezone()), timezone() from ts_4893.meters \
order by ts desc) limit 1000;", expectErrInfo="Invalid parameter data type : to_iso8601") # TS-5340
+ def test_greatest(self):
+ self.test_normal_query_new("greatest")
+
+ tdSql.execute("alter local 'compareAsStrInGreatest' '1';")
+
+ tdSql.query("select GREATEST(NULL, NULL, NULL, NULL);")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, None)
+
+ tdSql.query("select GREATEST(1, NULL, NULL, NULL);")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, None)
+
+ tdSql.query("select GREATEST(id, NULL, 1) from ts_4893.meters order by ts limit 10;")
+ tdSql.checkRows(10)
+ tdSql.checkData(0, 0, None)
+
+ tdSql.query("select GREATEST(cast(100 as tinyint), cast(101 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "1970-01-01 08:00:00.101")
+
+ tdSql.query("select GREATEST(cast(101 as tinyint), cast(100 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "1970-01-01 08:00:00.101")
+
+ tdSql.query("select GREATEST(cast(1000 as smallint), cast(1001 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "1970-01-01 08:00:01.001")
+
+ tdSql.query("select GREATEST(cast(1001 as smallint), cast(1000 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "1970-01-01 08:00:01.001")
+
+ tdSql.query("select GREATEST(cast(1000000 as int), cast(1000001 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "1970-01-01 08:16:40.001")
+
+ tdSql.query("select GREATEST(cast(1000001 as int), cast(1000000 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "1970-01-01 08:16:40.001")
+
+ tdSql.query("select GREATEST(cast(1000000000 as bigint), cast(1000000001 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "1970-01-12 21:46:40.001")
+
+ tdSql.query("select GREATEST(cast(1000000001 as bigint), cast(1000000000 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "1970-01-12 21:46:40.001")
+
+ tdSql.query("select GREATEST(cast(1725506504000 as timestamp), cast(1725506510000 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "2024-09-05 11:21:50")
+
+ tdSql.query("select GREATEST(cast(1725506510000 as timestamp), cast(1725506504000 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "2024-09-05 11:21:50")
+
+ tdSql.query("select GREATEST(cast(100 as tinyint), cast(101 as varchar(20)), cast(102 as float));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "102.000000")
+
+ tdSql.query("select GREATEST(cast(100 as varchar(20)), cast(101 as tinyint), cast(102 as float));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "102.000000")
+
+ tdSql.query("select GREATEST(now, 1);")
+ tdSql.query("select GREATEST(now, 1.0);")
+ tdSql.query("select GREATEST(now, '1');")
+
+ tdSql.error("select GREATEST(1)")
+ tdSql.error("select GREATEST(cast('a' as varbinary), cast('b' as varbinary), 'c', 'd');")
+ tdSql.error("select GREATEST(6, cast('f' as varbinary), cast('b' as varbinary), 'c', 'd');")
+
+ def test_least(self):
+ self.test_normal_query_new("least")
+
+ tdSql.execute("alter local 'compareAsStrInGreatest' '1';")
+
+ tdSql.query("select LEAST(NULL, NULL, NULL, NULL);")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, None)
+
+ tdSql.query("select LEAST(1, NULL, NULL, NULL);")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, None)
+
+ tdSql.query("select LEAST(id, NULL, 1) from ts_4893.meters order by ts limit 10;")
+ tdSql.checkRows(10)
+ tdSql.checkData(0, 0, None)
+
+ tdSql.query("select LEAST(cast(100 as tinyint), cast(101 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "1970-01-01 08:00:00.100")
+
+ tdSql.query("select LEAST(cast(101 as tinyint), cast(100 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "1970-01-01 08:00:00.100")
+
+ tdSql.query("select LEAST(cast(1000 as smallint), cast(1001 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "1970-01-01 08:00:01.000")
+
+ tdSql.query("select LEAST(cast(1001 as smallint), cast(1000 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "1970-01-01 08:00:01.000")
+
+ tdSql.query("select LEAST(cast(1000000 as int), cast(1000001 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "1970-01-01 08:16:40.000")
+
+ tdSql.query("select LEAST(cast(1000001 as int), cast(1000000 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "1970-01-01 08:16:40.000")
+
+ tdSql.query("select LEAST(cast(1000000000 as bigint), cast(1000000001 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "1970-01-12 21:46:40.000")
+
+ tdSql.query("select LEAST(cast(1000000001 as bigint), cast(1000000000 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "1970-01-12 21:46:40.000")
+
+ tdSql.query("select LEAST(cast(1725506504000 as timestamp), cast(1725506510000 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "2024-09-05 11:21:44")
+
+ tdSql.query("select LEAST(cast(1725506510000 as timestamp), cast(1725506504000 as timestamp));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "2024-09-05 11:21:44")
+
+ tdSql.query("select LEAST(cast(100 as tinyint), cast(101 as varchar(20)), cast(102 as float));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "100")
+
+ tdSql.query("select LEAST(cast(100 as varchar(20)), cast(101 as tinyint), cast(102 as float));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "100")
+
+ tdSql.query("select LEAST(cast(100 as float), cast(101 as tinyint), cast(102 as varchar(20)));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "100.000000")
+
+ tdSql.query("select LEAST(cast(100 as float), cast(101 as varchar(20)), cast(102 as tinyint));")
+ tdSql.checkRows(1)
+ tdSql.checkData(0, 0, "100.000000")
+
+ tdSql.query("select LEAST(now, 1);")
+ tdSql.checkRows(1)
+ tdSql.checkCols(1)
+ tdSql.checkData(0, 0, "1970-01-01 08:00:00.001")
+
+ tdSql.query("select LEAST(now, 1.0);")
+ tdSql.checkRows(1)
+ tdSql.checkCols(1)
+ tdSql.checkData(0, 0, 1)
+
+ tdSql.query("select LEAST(now, '1');")
+ tdSql.checkRows(1)
+ tdSql.checkCols(1)
+ tdSql.checkData(0, 0, "1")
+
+ tdSql.error("select LEAST(cast('a' as varbinary), cast('b' as varbinary), 'c', 'd');")
+ tdSql.error("select LEAST(cast('f' as varbinary), cast('b' as varbinary), 'c', 'd');")
+
+ def test_greatest_large_table(self):
+ tdLog.info("test greatest large table.")
+
+ ts = 1741341251000
+ create_table_sql = "CREATE TABLE `large_table` (`ts` TIMESTAMP"
+ for i in range(1, 1001):
+ if i % 5 == 1:
+ create_table_sql += f", `col{i}` INT"
+ elif i % 5 == 2:
+ create_table_sql += f", `col{i}` FLOAT"
+ elif i % 5 == 3:
+ create_table_sql += f", `col{i}` DOUBLE"
+ elif i % 5 == 4:
+ create_table_sql += f", `col{i}` VARCHAR(64)"
+ else:
+ create_table_sql += f", `col{i}` NCHAR(50)"
+ create_table_sql += ");"
+ tdSql.execute(create_table_sql)
+
+ for j in range(1000):
+ insert_sql = f"INSERT INTO `large_table` VALUES ({ts +j}"
+ for i in range(1, 1001):
+ if i % 5 == 1:
+ insert_sql += f", {j + i}"
+ elif i % 5 == 2:
+ insert_sql += f", {j + i}.1"
+ elif i % 5 == 3:
+ insert_sql += f", {j + i}.2"
+ elif i % 5 == 4:
+ insert_sql += f", '{j + i}'"
+ else:
+ insert_sql += f", '{j + i}'"
+ insert_sql += ");"
+ tdSql.execute(insert_sql)
+
+ greatest_query = "SELECT GREATEST("
+ for i in range(1, 1001):
+ greatest_query += f"`col{i}`"
+ if i < 1000:
+ greatest_query += ", "
+ greatest_query += ") FROM `large_table` LIMIT 1;"
+ tdLog.info(f"greatest_query: {greatest_query}")
+ tdSql.execute(greatest_query)
+
+ greatest_query = "SELECT "
+ for i in range(1, 1001):
+ greatest_query += f"`col{i}` > `col5`"
+ if i < 1000:
+ greatest_query += ", "
+ greatest_query += " FROM `large_table` LIMIT 1;"
+ tdLog.info(f"greatest_query: {greatest_query}")
+ tdSql.execute(greatest_query)
+
def run(self):
tdLog.debug(f"start to excute {__file__}")
@@ -326,7 +516,10 @@ class TDTestCase(TBase):
self.test_degrees()
self.test_radians()
self.test_rand()
-
+ self.test_greatest()
+ self.test_least()
+ self.test_greatest_large_table()
+
# char function
self.test_char_length()
self.test_char()
diff --git a/tests/army/tools/benchmark/basic/insertBasic.py b/tests/army/tools/benchmark/basic/insertBasic.py
index f1d3b81732..dfc5e3aff1 100644
--- a/tests/army/tools/benchmark/basic/insertBasic.py
+++ b/tests/army/tools/benchmark/basic/insertBasic.py
@@ -13,6 +13,7 @@
import os
import json
import frame
+import frame.eos
import frame.etool
from frame.log import *
from frame.cases import *
@@ -109,7 +110,6 @@ class TDTestCase(TBase):
tdLog.info(f" vgroups real={tdSql.getData(0,0)} expect={vgroups}")
tdSql.checkData(0, 0, vgroups, True)
-
# bugs ts
def checkVGroups(self, benchmark):
# vgroups with command line set
@@ -117,12 +117,19 @@ class TDTestCase(TBase):
# vgroups with json file
self.testBenchmarkJson(benchmark, "./tools/benchmark/basic/json/insertBasic.json", "", True)
+
+ def checkInsertManyStb(self):
+ # many stb
+ self.benchInsert("./tools/benchmark/basic/json/insertManyStb.json")
+
def run(self):
- benchmark = etool.benchMarkFile()
+ benchmark = frame.etool.benchMarkFile()
# vgroups
self.checkVGroups(benchmark)
+ # check many stable
+ self.checkInsertManyStb()
def stop(self):
tdSql.close()
diff --git a/tests/army/tools/benchmark/basic/json/insertManyStb.json b/tests/army/tools/benchmark/basic/json/insertManyStb.json
new file mode 100644
index 0000000000..caa418c858
--- /dev/null
+++ b/tests/army/tools/benchmark/basic/json/insertManyStb.json
@@ -0,0 +1,151 @@
+{
+ "filetype": "insert",
+ "cfgdir": "/etc/taos",
+ "host": "127.0.0.1",
+ "port": 6030,
+ "user": "root",
+ "password": "taosdata",
+ "num_of_records_per_req": 3000,
+ "thread_count": 2,
+ "confirm_parameter_prompt": "no",
+ "databases": [
+ {
+ "dbinfo": {
+ "name": "test1",
+ "drop": "yes",
+ "precision": "us",
+ "vgroups": 1
+ },
+ "super_tables": [
+ {
+ "name": "meters1",
+ "child_table_exists": "no",
+ "childtable_count": 2,
+ "insert_rows": 1000,
+ "childtable_prefix": "da",
+ "insert_mode": "stmt",
+ "timestamp_step": 15,
+ "start_timestamp":1700000000000000,
+ "columns": [
+ { "type": "double", "name": "dc", "max": 10, "min": 0 },
+ { "type": "tinyint", "name": "ti", "max": 100, "min": -100 },
+ { "type": "binary", "name": "bin", "len": 4}
+ ],
+ "tags": [
+ { "type": "usmallint", "name": "tusi", "max": 100, "min": 0 },
+ { "type": "uint", "name": "tui", "max": 1000, "min": 0 }
+ ]
+ },
+ {
+ "name": "meters2",
+ "child_table_exists": "no",
+ "childtable_count": 3,
+ "insert_rows": 100,
+ "childtable_prefix": "db",
+ "insert_mode": "stmt",
+ "timestamp_step": 20,
+ "interlace_rows": 1,
+ "start_timestamp":1700000000000000,
+ "columns": [
+ { "type": "double", "name": "dc", "max": 10, "min": 0 },
+ { "type": "tinyint", "name": "ti", "max": 100, "min": -100 },
+ { "type": "binary", "name": "bin", "len": 4}
+ ],
+ "tags": [
+ { "type": "usmallint", "name": "tusi", "max": 100, "min": 0 },
+ { "type": "uint", "name": "tui", "max": 1000, "min": 0 }
+ ]
+ },
+ {
+ "name": "meters3",
+ "child_table_exists": "no",
+ "childtable_count": 5,
+ "insert_rows": 100,
+ "childtable_prefix": "dc",
+ "insert_mode": "stmt2",
+ "timestamp_step": 20,
+ "interlace_rows": 1,
+ "start_timestamp":1700000000000000,
+ "columns": [
+ { "type": "double", "name": "dc", "max": 10, "min": 0 },
+ { "type": "tinyint", "name": "ti", "max": 100, "min": -100 },
+ { "type": "binary", "name": "bin", "len": 4}
+ ],
+ "tags": [
+ { "type": "usmallint", "name": "tusi", "max": 100, "min": 0 },
+ { "type": "uint", "name": "tui", "max": 1000, "min": 0 }
+ ]
+ },
+ {
+ "name": "meters4",
+ "child_table_exists": "no",
+ "childtable_count": 2,
+ "insert_rows": 70,
+ "childtable_prefix": "dd",
+ "insert_mode": "stmt2",
+ "timestamp_step": 50,
+ "interlace_rows": 0,
+ "start_timestamp":1700000000000000,
+ "columns": [
+ { "type": "double", "name": "dc", "max": 10, "min": 0 },
+ { "type": "tinyint", "name": "ti", "max": 100, "min": -100 },
+ { "type": "binary", "name": "bin", "len": 4}
+ ],
+ "tags": [
+ { "type": "usmallint", "name": "tusi", "max": 100, "min": 0 },
+ { "type": "uint", "name": "tui", "max": 1000, "min": 0 }
+ ]
+ }
+ ]
+ },
+ {
+ "dbinfo": {
+ "name": "test2",
+ "drop": "yes",
+ "precision": "ns",
+ "vgroups": 2
+ },
+ "super_tables": [
+ {
+ "name": "meters1",
+ "child_table_exists": "no",
+ "childtable_count": 3,
+ "insert_rows": 120,
+ "childtable_prefix": "de",
+ "insert_mode": "taosc",
+ "timestamp_step": 15,
+ "start_timestamp":1700000000000000000,
+ "columns": [
+ { "type": "double", "name": "dc", "max": 10, "min": 0 },
+ { "type": "tinyint", "name": "ti", "max": 100, "min": -100 },
+ { "type": "binary", "name": "bin", "len": 4}
+ ],
+ "tags": [
+ { "type": "usmallint", "name": "tusi", "max": 100, "min": 0 },
+ { "type": "uint", "name": "tui", "max": 1000, "min": 0 }
+ ]
+ },
+ {
+ "name": "meters2",
+ "child_table_exists": "no",
+ "childtable_count": 2,
+ "insert_rows": 200,
+ "childtable_prefix": "df",
+ "insert_mode": "taosc",
+ "timestamp_step": 2,
+ "interlace_rows": 4,
+ "start_timestamp":1700000000000000000,
+ "columns": [
+ { "type": "double", "name": "dc", "max": 10, "min": 0 },
+ { "type": "tinyint", "name": "ti", "max": 100, "min": -100 },
+ { "type": "binary", "name": "bin", "len": 4}
+ ],
+ "tags": [
+ { "type": "usmallint", "name": "tusi", "max": 100, "min": 0 },
+ { "type": "uint", "name": "tui", "max": 1000, "min": 0 }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/tests/army/tools/benchmark/basic/json/queryErrorBatchNoMix.json b/tests/army/tools/benchmark/basic/json/queryErrorBatchNoMix.json
new file mode 100644
index 0000000000..97b542b789
--- /dev/null
+++ b/tests/army/tools/benchmark/basic/json/queryErrorBatchNoMix.json
@@ -0,0 +1,36 @@
+{
+ "filetype": "query",
+ "cfgdir": "/etc/taos",
+ "host": "127.0.0.1",
+ "port": 6030,
+ "user": "root",
+ "password": "taosdata",
+ "confirm_parameter_prompt": "no",
+ "databases": "test",
+ "query_times": 5,
+ "query_mode": "taosc",
+ "specified_table_query": {
+ "concurrent": 5,
+ "query_interval": 0,
+ "mixed_query": "no",
+ "batch_query": "yes",
+ "sqls": [
+ {
+ "sql": "select last_row(*) from test.meters"
+ },
+ {
+ "sql": "select count(*) from test.meters"
+ },
+ {
+ "sql": "select * from test.d0",
+ "result": "./query_res1.txt"
+ },
+ {
+ "sql": "select count(*) from test.d1"
+ },
+ {
+ "sql": "select * from test.d2"
+ }
+ ]
+ }
+}
diff --git a/tests/army/tools/benchmark/basic/json/queryErrorBatchRest.json b/tests/army/tools/benchmark/basic/json/queryErrorBatchRest.json
new file mode 100644
index 0000000000..d47ce55ae4
--- /dev/null
+++ b/tests/army/tools/benchmark/basic/json/queryErrorBatchRest.json
@@ -0,0 +1,36 @@
+{
+ "filetype": "query",
+ "cfgdir": "/etc/taos",
+ "host": "127.0.0.1",
+ "port": 6030,
+ "user": "root",
+ "password": "taosdata",
+ "confirm_parameter_prompt": "no",
+ "databases": "test",
+ "query_times": 5,
+ "query_mode": "rest",
+ "specified_table_query": {
+ "concurrent": 5,
+ "query_interval": 1000,
+ "mixed_query": "yes",
+ "batch_query": "yes",
+ "sqls": [
+ {
+ "sql": "select last_row(*) from test.meters"
+ },
+ {
+ "sql": "select count(*) from test.meters"
+ },
+ {
+ "sql": "select * from test.d0",
+ "result": "./query_res1.txt"
+ },
+ {
+ "sql": "select count(*) from test.d1"
+ },
+ {
+ "sql": "select * from test.d2"
+ }
+ ]
+ }
+}
diff --git a/tests/army/tools/benchmark/basic/json/queryModeSpecMixBatch.json b/tests/army/tools/benchmark/basic/json/queryModeSpecMixBatch.json
new file mode 100644
index 0000000000..6740c585c3
--- /dev/null
+++ b/tests/army/tools/benchmark/basic/json/queryModeSpecMixBatch.json
@@ -0,0 +1,36 @@
+{
+ "filetype": "query",
+ "cfgdir": "/etc/taos",
+ "host": "127.0.0.1",
+ "port": 6030,
+ "user": "root",
+ "password": "taosdata",
+ "confirm_parameter_prompt": "no",
+ "databases": "test",
+ "query_times": 5,
+ "query_mode": "taosc",
+ "specified_table_query": {
+ "concurrent": 5,
+ "query_interval": 1000,
+ "mixed_query": "yes",
+ "batch_query": "yes",
+ "sqls": [
+ {
+ "sql": "select last_row(*) from test.meters"
+ },
+ {
+ "sql": "select count(*) from test.meters"
+ },
+ {
+ "sql": "select * from test.d0",
+ "result": "./query_res1.txt"
+ },
+ {
+ "sql": "select count(*) from test.d1"
+ },
+ {
+ "sql": "select * from test.d2"
+ }
+ ]
+ }
+}
diff --git a/tests/army/tools/benchmark/basic/json/queryModeSpecMixBatchRest.json b/tests/army/tools/benchmark/basic/json/queryModeSpecMixBatchRest.json
new file mode 100644
index 0000000000..b2ffbe1434
--- /dev/null
+++ b/tests/army/tools/benchmark/basic/json/queryModeSpecMixBatchRest.json
@@ -0,0 +1,36 @@
+{
+ "filetype": "query",
+ "cfgdir": "/etc/taos",
+ "host": "127.0.0.1",
+ "port": 6030,
+ "user": "root",
+ "password": "taosdata",
+ "confirm_parameter_prompt": "no",
+ "databases": "test",
+ "query_times": 5,
+ "query_mode": "taosc",
+ "specified_table_query": {
+ "concurrent": 5,
+ "query_interval": 100,
+ "mixed_query": "yes",
+ "batch_query": "no",
+ "sqls": [
+ {
+ "sql": "select last_row(*) from test.meters"
+ },
+ {
+ "sql": "select count(*) from test.meters"
+ },
+ {
+ "sql": "select * from test.d0",
+ "result": "./query_res1.txt"
+ },
+ {
+ "sql": "select count(*) from test.d1"
+ },
+ {
+ "sql": "select * from test.d2"
+ }
+ ]
+ }
+}
diff --git a/tests/army/tools/benchmark/basic/queryMain.py b/tests/army/tools/benchmark/basic/queryMain.py
index bd6fa9ca31..2c7f45c975 100644
--- a/tests/army/tools/benchmark/basic/queryMain.py
+++ b/tests/army/tools/benchmark/basic/queryMain.py
@@ -90,15 +90,15 @@ class TDTestCase(TBase):
fval = float(value)
# compare
if equal and fval != expect:
- tdLog.exit(f"check not expect. expect:{expect} real:{fval}, key:{key} end:{end} output:\n{output}")
+ tdLog.exit(f"check not expect. expect:{expect} real:{fval}, key:'{key}' end:'{end}' output:\n{output}")
elif equal == False and fval <= expect:
- tdLog.exit(f"failed because {fval} <= {expect}, key:{key} end:{end} output:\n{output}")
+ tdLog.exit(f"failed because {fval} <= {expect}, key:'{key}' end:'{end}' output:\n{output}")
else:
# succ
if equal:
- tdLog.info(f"check successfully. key:{key} expect:{expect} real:{fval}")
+ tdLog.info(f"check successfully. key:'{key}' expect:{expect} real:{fval}")
else:
- tdLog.info(f"check successfully. key:{key} {fval} > {expect}")
+ tdLog.info(f"check successfully. key:'{key}' {fval} > {expect}")
def checkAfterRun(self, benchmark, jsonFile, specMode, tbCnt):
@@ -128,16 +128,24 @@ class TDTestCase(TBase):
sqls = data[label]["sqls"]
- # mix
+ # batch_query
+ try:
+ batchQuery = data[label]["batch_query"]
+ except:
+ batchQuery = "no"
+
+ # mixed_query
try:
mixedQuery = data[label]["mixed_query"]
except:
mixedQuery = "no"
- tdLog.info(f"queryTimes={queryTimes} concurrent={concurrent} mixedQuery={mixedQuery} len(sqls)={len(sqls)} label={label}\n")
+ tdLog.info(f"queryTimes={queryTimes} concurrent={concurrent} mixedQuery={mixedQuery} "
+ f"batchQuery={batchQuery} len(sqls)={len(sqls)} label={label}\n")
- totalQueries = 0
+ totalQueries = 0
threadQueries = 0
+ QPS = 10
if continueIfFail.lower() == "yes":
allEnd = " "
@@ -154,13 +162,20 @@ class TDTestCase(TBase):
minKey = "min:"
else:
# spec mixed or super
+
if specMode:
- # spec
totalQueries = queryTimes * len(sqls)
+ # spec mixed
+ if batchQuery.lower() == "yes":
+ # batch
+ threadQueries = len(sqls)
+ QPS = 2
+ else:
+ threadQueries = totalQueries
else:
# super
totalQueries = queryTimes * len(sqls) * tbCnt
- threadQueries = totalQueries
+ threadQueries = totalQueries
nSql = len(sqls)
if specMode and nSql < concurrent :
@@ -182,7 +197,7 @@ class TDTestCase(TBase):
["p99: ", "s", 0, False],
["INFO: Spend ", " ", 0, False],
["completed total queries: ", ",", totalQueries, True],
- ["the QPS of all threads:", allEnd, 10 , False] # all qps need > 5
+ ["the QPS of all threads:", allEnd, QPS , False] # all qps need > 5
]
# check
@@ -196,6 +211,7 @@ class TDTestCase(TBase):
args = [
["./tools/benchmark/basic/json/queryModeSpec", True],
["./tools/benchmark/basic/json/queryModeSpecMix", True],
+ ["./tools/benchmark/basic/json/queryModeSpecMixBatch", True],
["./tools/benchmark/basic/json/queryModeSuper", False]
]
@@ -222,8 +238,9 @@ class TDTestCase(TBase):
self.expectFailed(f"{benchmark} -f ./tools/benchmark/basic/json/queryErrorBothSpecSuper.json")
# json format error
self.expectFailed(f"{benchmark} -f ./tools/benchmark/basic/json/queryErrorFormat.json")
-
-
+ # batch query
+ self.expectFailed(f"{benchmark} -f ./tools/benchmark/basic/json/queryErrorBatchNoMix.json")
+ self.expectFailed(f"{benchmark} -f ./tools/benchmark/basic/json/queryErrorBatchRest.json")
def run(self):
tbCnt = 10
diff --git a/tests/script/tsim/analytics/basic0.sim b/tests/script/tsim/analytics/basic0.sim
index 999b2fff37..0d9a29a19b 100644
--- a/tests/script/tsim/analytics/basic0.sim
+++ b/tests/script/tsim/analytics/basic0.sim
@@ -91,6 +91,14 @@ sql_error select count(*) from ct1 anomaly_window(c6, 'algo=ksigma,k=2');
sql_error select forecast(c6, 'algo=holtwinters,conf=0.5,wncheck=1,period=0') from ct1
+print ==================== invalid timeout parameter, will reset the parameters.
+sql select forecast(c1, 'algo=holtwinters, timeout=6000') from ct1;
+sql select forecast(c1, 'algo=holtwinters, timeout=0') from ct1;
+
+print =========================== valid timeout
+sql select forecast(c1, 'algo=holtwinters, timeout=120') from ct1;
+
+
sql_error select _frowts, _flow, _fhigh, forecast(c1, 'algo=holtwinters,conf=0.5,wncheck=1,period=0') from ct1
sql_error select _frowts, _flow, _fhigh, forecast(c1, 'algo=holtwinters,conf=119,wncheck=1,period=0') from ct1
sql_error select _frowts, _flow, _fhigh, forecast(c1, 'algo=holtwinters1,conf=0.5,wncheck=1,period=0') from ct1
diff --git a/tests/system-test/0-others/test_show_disk_usage.py b/tests/system-test/0-others/test_show_disk_usage.py
index eb5bdf1aa7..1c863d7cdf 100644
--- a/tests/system-test/0-others/test_show_disk_usage.py
+++ b/tests/system-test/0-others/test_show_disk_usage.py
@@ -102,7 +102,8 @@ class TDTestCase:
elif "Compress_radio=" in item[0]:
value = item[0].split("=")[1].split(" ")[0].replace("[", "").replace("]", "")
if value != 'NULL':
- compress_radio = float(value)
+ tValue = value[0:len(value) - 1]
+ compress_radio = float(tValue)
#tdLog.debug("compress_occupied: %s" % compress_radio)
return disk_occupied, compress_radio
diff --git a/tests/system-test/2-query/limit.py b/tests/system-test/2-query/limit.py
index e6736704f7..34944a1282 100644
--- a/tests/system-test/2-query/limit.py
+++ b/tests/system-test/2-query/limit.py
@@ -360,7 +360,19 @@ class TDTestCase:
tdSql.checkRows(0)
tdLog.info("check db1 vgroups 1 limit 1 offset 100 successfully!")
-
+ def ts6080(self):
+ tdLog.printNoPrefix("======== test case 6080: ")
+ tdSql.execute("create database db6080 vgroups 1;")
+ tdSql.execute("use db6080;")
+ tdSql.execute("create table db6080.st(ts timestamp, age int) tags(area int);")
+ tdSql.execute("create table db6080.t1 using db6080.st tags(1);")
+
+ tdSql.Execute("insert into db6080.t1 values(1537146000000, 1);")
+ tdSql.Execute("insert into db6080.t1 values(1537146000001, 2);")
+
+ tdSql.query("select ts, age from (select ts, age from db6080.t1 order by ts limit 1) where ts > 1537146000000;")
+ tdSql.checkRows(0)
+
def run(self):
# tdSql.prepare()
self.prepareTestEnv()
@@ -368,6 +380,7 @@ class TDTestCase:
# one vgroup diff more than one vgroup check
self.checkVGroups()
+
def stop(self):
diff --git a/tests/system-test/8-stream/checkpoint_info2.py b/tests/system-test/8-stream/checkpoint_info2.py
index 3dc57477f7..f4c8da8c9d 100644
--- a/tests/system-test/8-stream/checkpoint_info2.py
+++ b/tests/system-test/8-stream/checkpoint_info2.py
@@ -22,6 +22,8 @@ from util.cluster import *
# should be used by -N option
class TDTestCase:
updatecfgDict = {'checkpointInterval': 60 ,
+ 'vdebugflag':143,
+ 'ddebugflag':143
}
def init(self, conn, logSql, replicaVar=1):
self.replicaVar = int(replicaVar)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 110a644e90..1ee2bc4ce6 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -19,7 +19,8 @@ IF(TD_WEBSOCKET)
PATCH_COMMAND
COMMAND git clean -f -d
BUILD_COMMAND
- COMMAND RUSTFLAGS=-Ctarget-feature=-crt-static cargo build --release --locked -p taos-ws-sys --features rustls
+ COMMAND cargo update
+ COMMAND RUSTFLAGS=-Ctarget-feature=-crt-static cargo build --release -p taos-ws-sys --features rustls
INSTALL_COMMAND
COMMAND cp target/release/${websocket_lib_file} ${CMAKE_BINARY_DIR}/build/lib
COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
@@ -37,7 +38,8 @@ IF(TD_WEBSOCKET)
PATCH_COMMAND
COMMAND git clean -f -d
BUILD_COMMAND
- COMMAND cargo build --release --locked -p taos-ws-sys --features rustls
+ COMMAND cargo update
+ COMMAND cargo build --release -p taos-ws-sys --features rustls
INSTALL_COMMAND
COMMAND cp target/release/taosws.dll ${CMAKE_BINARY_DIR}/build/lib
COMMAND cp target/release/taosws.dll.lib ${CMAKE_BINARY_DIR}/build/lib/taosws.lib
@@ -56,7 +58,8 @@ IF(TD_WEBSOCKET)
PATCH_COMMAND
COMMAND git clean -f -d
BUILD_COMMAND
- COMMAND cargo build --release --locked -p taos-ws-sys --features rustls
+ COMMAND cargo update
+ COMMAND cargo build --release -p taos-ws-sys --features rustls
INSTALL_COMMAND
COMMAND cp target/release/${websocket_lib_file} ${CMAKE_BINARY_DIR}/build/lib
COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
index a3e542a768..99b1c204a2 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -668,28 +668,22 @@ void shellPrintField(const char *val, TAOS_FIELD *field, int32_t width, int32_t
printf("%*" PRIu64, width, *((uint64_t *)val));
break;
case TSDB_DATA_TYPE_FLOAT:
+ width = width >= LENGTH ? LENGTH - 1 : width;
if (tsEnableScience) {
printf("%*.7e", width, GET_FLOAT_VAL(val));
} else {
- n = snprintf(buf, LENGTH, "%*.*g", width, FLT_DIG, GET_FLOAT_VAL(val));
- if (n > SHELL_FLOAT_WIDTH) {
- printf("%*.7e", width, GET_FLOAT_VAL(val));
- } else {
- printf("%s", buf);
- }
+ snprintf(buf, LENGTH, "%*.*g", width, FLT_DIG, GET_FLOAT_VAL(val));
+ printf("%s", buf);
}
break;
case TSDB_DATA_TYPE_DOUBLE:
+ width = width >= LENGTH ? LENGTH - 1 : width;
if (tsEnableScience) {
snprintf(buf, LENGTH, "%*.15e", width, GET_DOUBLE_VAL(val));
printf("%s", buf);
} else {
- n = snprintf(buf, LENGTH, "%*.*g", width, DBL_DIG, GET_DOUBLE_VAL(val));
- if (n > SHELL_DOUBLE_WIDTH) {
- printf("%*.15e", width, GET_DOUBLE_VAL(val));
- } else {
- printf("%*s", width, buf);
- }
+ snprintf(buf, LENGTH, "%*.*g", width, DBL_DIG, GET_DOUBLE_VAL(val));
+ printf("%*s", width, buf);
}
break;
case TSDB_DATA_TYPE_VARBINARY: {
diff --git a/tools/taos-tools/inc/bench.h b/tools/taos-tools/inc/bench.h
index 17e381ffb5..b432e20113 100644
--- a/tools/taos-tools/inc/bench.h
+++ b/tools/taos-tools/inc/bench.h
@@ -665,6 +665,7 @@ typedef struct SpecifiedQueryInfo_S {
TAOS_RES *res[MAX_QUERY_SQL_COUNT];
uint64_t totalQueried;
bool mixed_query;
+ bool batchQuery; // mixed query have batch and no batch query
// error rate
uint64_t totalFail;
} SpecifiedQueryInfo;
diff --git a/tools/taos-tools/src/benchInsert.c b/tools/taos-tools/src/benchInsert.c
index 885a6e529f..894e4621a0 100644
--- a/tools/taos-tools/src/benchInsert.c
+++ b/tools/taos-tools/src/benchInsert.c
@@ -1928,7 +1928,7 @@ static void *syncWriteInterlace(void *sarg) {
bindv = createBindV(nBatchTable, tagCnt, stbInfo->cols->size + 1);
}
- bool oldInitStmt = stbInfo->autoTblCreating || database->superTbls->size > 1;
+ bool oldInitStmt = stbInfo->autoTblCreating;
// not auto create table call once
if(stbInfo->iface == STMT_IFACE && !oldInitStmt) {
debugPrint("call prepareStmt for stable:%s\n", stbInfo->stbName);
@@ -2900,7 +2900,7 @@ void *syncWriteProgressive(void *sarg) {
tagData = benchCalloc(TAG_BATCH_COUNT, stbInfo->lenOfTags, false);
}
- bool oldInitStmt = stbInfo->autoTblCreating || database->superTbls->size > 1;
+ bool oldInitStmt = stbInfo->autoTblCreating;
// stmt. not auto table create call on stmt
if (stbInfo->iface == STMT_IFACE && !oldInitStmt) {
if (prepareStmt(pThreadInfo->conn->stmt, stbInfo, tagData, w)) {
@@ -3909,11 +3909,8 @@ int32_t initInsertThread(SDataBase* database, SSuperTable* stbInfo, int32_t nthr
if (NULL == pThreadInfo->conn) {
goto END;
}
+ // single always true for benchmark
bool single = true;
- if (database->superTbls->size > 1) {
- single = false;
- }
-
if (stbInfo->iface == STMT2_IFACE) {
// stmt2 init
if (pThreadInfo->conn->stmt2)
diff --git a/tools/taos-tools/src/benchJsonOpt.c b/tools/taos-tools/src/benchJsonOpt.c
index 5b992b388e..9bbecebe65 100644
--- a/tools/taos-tools/src/benchJsonOpt.c
+++ b/tools/taos-tools/src/benchJsonOpt.c
@@ -1860,6 +1860,23 @@ int32_t readSpecQueryJson(tools_cJSON * specifiedQuery) {
}
}
+ // batchQuery
+ tools_cJSON *batchQueryObj =
+ tools_cJSON_GetObjectItem(specifiedQuery, "batch_query");
+ if (tools_cJSON_IsString(batchQueryObj)) {
+ if (0 == strcasecmp(batchQueryObj->valuestring, "yes")) {
+ g_queryInfo.specifiedQueryInfo.batchQuery = true;
+ infoPrint("%s\n","batch_query is True");
+ } else if (0 == strcasecmp(batchQueryObj->valuestring, "no")) {
+ g_queryInfo.specifiedQueryInfo.batchQuery = false;
+ infoPrint("%s\n","batch_query is False");
+ } else {
+ errorPrint("Invalid batch_query value: %s\n",
+ batchQueryObj->valuestring);
+ return -1;
+ }
+ }
+
tools_cJSON *concurrent =
tools_cJSON_GetObjectItem(specifiedQuery, "concurrent");
if (tools_cJSON_IsNumber(concurrent)) {
diff --git a/tools/taos-tools/src/benchMain.c b/tools/taos-tools/src/benchMain.c
index e82da29468..16b3e3a617 100644
--- a/tools/taos-tools/src/benchMain.c
+++ b/tools/taos-tools/src/benchMain.c
@@ -47,7 +47,7 @@ void* benchCancelHandler(void* arg) {
}
#endif
-void checkArgumentValid() {
+int checkArgumentValid() {
// check prepared_rand valid
if(g_arguments->prepared_rand < g_arguments->reqPerReq) {
infoPrint("prepared_rand(%"PRIu64") < num_of_records_per_req(%d), so set num_of_records_per_req = prepared_rand\n",
@@ -64,13 +64,32 @@ void checkArgumentValid() {
false,
1)) {
errorPrint("%s", "Failed to convert server address\n");
- return;
+ return -1;
}
encodeAuthBase64();
g_arguments->rest_server_ver_major =
getServerVersionRest(g_arguments->port);
}
+ // check batch query
+ if (g_arguments->test_mode == QUERY_TEST) {
+ if (g_queryInfo.specifiedQueryInfo.batchQuery) {
+ // batch_query = yes
+ if (!g_queryInfo.specifiedQueryInfo.mixed_query) {
+ // mixed_query = no
+ errorPrint("%s\n", "batch_query = yes require mixed_query is yes");
+ return -1;
+ }
+
+ // rest not support
+ if (g_queryInfo.iface == REST_IFACE) {
+ errorPrint("%s\n", "batch_query = yes not support restful.");
+ return -1;
+ }
+ }
+ }
+
+ return 0;
}
int main(int argc, char* argv[]) {
@@ -144,7 +163,11 @@ int main(int argc, char* argv[]) {
}
infoPrint("client version: %s\n", taos_get_client_info());
- checkArgumentValid();
+ if (checkArgumentValid()) {
+ errorPrint("failed to readJsonConfig %s\n", g_arguments->metaFile);
+ exitLog();
+ return -1;
+ }
if (g_arguments->test_mode == INSERT_TEST) {
if (insertTestProcess()) {
diff --git a/tools/taos-tools/src/benchQuery.c b/tools/taos-tools/src/benchQuery.c
index 0de71d8b18..8be8bf9f6c 100644
--- a/tools/taos-tools/src/benchQuery.c
+++ b/tools/taos-tools/src/benchQuery.c
@@ -80,10 +80,15 @@ int selectAndGetResult(qThreadInfo *pThreadInfo, char *command, bool record) {
}
// interlligent sleep
-void autoSleep(uint64_t interval, uint64_t delay ) {
+int32_t autoSleep(uint64_t interval, uint64_t delay ) {
+ int32_t msleep = 0;
if (delay < interval * 1000) {
- toolsMsleep((int32_t)(interval * 1000 - delay)); // ms
+ msleep = (int32_t)((interval - delay/1000));
+ infoPrint("do sleep %dms ...\n", msleep);
+ toolsMsleep(msleep); // ms
+ debugPrint("%s\n","do sleep end");
}
+ return msleep;
}
// reset
@@ -140,10 +145,13 @@ static void *specQueryMixThread(void *sarg) {
int64_t st = 0;
int64_t et = 0;
- int64_t startTs = toolsGetTimestampMs();
- int64_t lastPrintTime = startTs;
- uint64_t queryTimes = g_queryInfo.specifiedQueryInfo.queryTimes;
- uint64_t interval = g_queryInfo.specifiedQueryInfo.queryInterval;
+ int64_t startTs = toolsGetTimestampMs();
+ int64_t lastPrintTime = startTs;
+ // batchQuery
+ bool batchQuery = g_queryInfo.specifiedQueryInfo.batchQuery;
+ uint64_t queryTimes = batchQuery ? 1 : g_queryInfo.specifiedQueryInfo.queryTimes;
+ uint64_t interval = batchQuery ? 0 : g_queryInfo.specifiedQueryInfo.queryInterval;
+
pThreadInfo->query_delay_list = benchArrayInit(queryTimes, sizeof(int64_t));
for (int i = pThreadInfo->start_sql; i <= pThreadInfo->end_sql; ++i) {
SSQL * sql = benchArrayGet(g_queryInfo.specifiedQueryInfo.sqls, i);
@@ -382,7 +390,7 @@ static void *stbQueryThread(void *sarg) {
// --------------------------------- firse level function ------------------------------
//
-void totalChildQuery(qThreadInfo* infos, int threadCnt, int64_t spend) {
+void totalChildQuery(qThreadInfo* infos, int threadCnt, int64_t spend, BArray *pDelays) {
// valid check
if (infos == NULL || threadCnt == 0) {
return ;
@@ -444,9 +452,11 @@ void totalChildQuery(qThreadInfo* infos, int threadCnt, int64_t spend) {
(int32_t)(delay_list->size * 0.99)))/1E6,
*(int64_t *)(benchArrayGet(delay_list,
(int32_t)(delay_list->size - 1)))/1E6);
- } else {
- errorPrint("%s() LN%d, delay_list size: %"PRId64"\n",
- __func__, __LINE__, (int64_t)delay_list->size);
+ }
+
+ // copy to another
+ if (pDelays) {
+ benchArrayAddBatch(pDelays, delay_list->pData, delay_list->size, false);
}
benchArrayDestroy(delay_list);
}
@@ -547,7 +557,7 @@ static int stbQuery(uint16_t iface, char* dbName) {
}
// total show
- totalChildQuery(threadInfos, threadCnt, end - start);
+ totalChildQuery(threadInfos, threadCnt, end - start, NULL);
ret = 0;
@@ -825,7 +835,7 @@ static int specQueryMix(uint16_t iface, char* dbName) {
}
// statistic
- totalChildQuery(infos, threadCnt, end - start);
+ totalChildQuery(infos, threadCnt, end - start, NULL);
ret = 0;
OVER:
@@ -838,6 +848,206 @@ OVER:
return ret;
}
+void totalBatchQuery(int32_t allSleep, BArray *pDelays) {
+ // sort
+ qsort(pDelays->pData, pDelays->size, pDelays->elemSize, compare);
+
+ // total delays
+ double totalDelays = 0;
+ for (size_t i = 0; i < pDelays->size; i++) {
+ int64_t *delay = benchArrayGet(pDelays, i);
+ totalDelays += *delay;
+ }
+
+ printf("\n");
+ // show sleep times
+ if (allSleep > 0) {
+ infoPrint("All sleep spend: %.3fs\n", (float)allSleep/1000);
+ }
+
+ // show P90 ...
+ if (pDelays->size) {
+ infoPrint(
+ "Total delay: "
+ "min delay: %.6fs, "
+ "avg delay: %.6fs, "
+ "p90: %.6fs, "
+ "p95: %.6fs, "
+ "p99: %.6fs, "
+ "max: %.6fs\n",
+ *(int64_t *)(benchArrayGet(pDelays, 0))/1E6,
+ (double)totalDelays/pDelays->size/1E6,
+ *(int64_t *)(benchArrayGet(pDelays,
+ (int32_t)(pDelays->size * 0.9)))/1E6,
+ *(int64_t *)(benchArrayGet(pDelays,
+ (int32_t)(pDelays->size * 0.95)))/1E6,
+ *(int64_t *)(benchArrayGet(pDelays,
+ (int32_t)(pDelays->size * 0.99)))/1E6,
+ *(int64_t *)(benchArrayGet(pDelays,
+ (int32_t)(pDelays->size - 1)))/1E6);
+ }
+}
+
+//
+// specQuery Mix Batch
+//
+static int specQueryBatch(uint16_t iface, char* dbName) {
+ // init
+ BArray *pDelays = NULL;
+ int ret = -1;
+ int nConcurrent = g_queryInfo.specifiedQueryInfo.concurrent;
+ uint64_t interval = g_queryInfo.specifiedQueryInfo.queryInterval;
+ pthread_t * pids = benchCalloc(nConcurrent, sizeof(pthread_t), true);
+ qThreadInfo *infos = benchCalloc(nConcurrent, sizeof(qThreadInfo), true);
+ infoPrint("start batch query, sleep interval:%" PRIu64 "ms query times:%" PRIu64 " thread:%d \n",
+ interval, g_queryInfo.query_times, nConcurrent);
+
+ // concurent calc
+ int total_sql_num = g_queryInfo.specifiedQueryInfo.sqls->size;
+ int start_sql = 0;
+ int a = total_sql_num / nConcurrent;
+ if (a < 1) {
+ warnPrint("sqls num:%d < concurent:%d, set concurrent %d\n", total_sql_num, nConcurrent, nConcurrent);
+ nConcurrent = total_sql_num;
+ a = 1;
+ }
+ int b = 0;
+ if (nConcurrent != 0) {
+ b = total_sql_num % nConcurrent;
+ }
+
+ //
+ // connect
+ //
+ int connCnt = 0;
+ for (int i = 0; i < nConcurrent; ++i) {
+ qThreadInfo *pThreadInfo = infos + i;
+ // create conn
+ if (initQueryConn(pThreadInfo, iface)){
+ ret = -1;
+ goto OVER;
+ }
+
+ connCnt ++;
+ }
+
+
+ // reset total
+ g_queryInfo.specifiedQueryInfo.totalQueried = 0;
+ g_queryInfo.specifiedQueryInfo.totalFail = 0;
+
+ //
+ // running
+ //
+ int threadCnt = 0;
+ int allSleep = 0;
+ pDelays = benchArrayInit(10, sizeof(int64_t));
+ for (int m = 0; m < g_queryInfo.query_times; ++m) {
+ // reset
+ threadCnt = 0;
+ start_sql = 0;
+
+ // create thread
+ for (int i = 0; i < nConcurrent; ++i) {
+ qThreadInfo *pThreadInfo = infos + i;
+ pThreadInfo->threadID = i;
+ pThreadInfo->start_sql = start_sql;
+ pThreadInfo->end_sql = i < b ? start_sql + a : start_sql + a - 1;
+ start_sql = pThreadInfo->end_sql + 1;
+ pThreadInfo->total_delay = 0;
+ // total zero
+ pThreadInfo->nSucc = 0;
+ pThreadInfo->nFail = 0;
+
+ // main run
+ int code = pthread_create(pids + i, NULL, specQueryMixThread, pThreadInfo);
+ if (code != 0) {
+ errorPrint("failed specQueryBatchThread create. error code =%d \n", code);
+ break;
+ }
+
+ threadCnt ++;
+ }
+
+ bool needExit = false;
+ if (threadCnt != nConcurrent) {
+ // if failed, set termainte flag true like ctrl+c exit
+ needExit = true;
+ g_arguments->terminate = true;
+ }
+
+ // wait thread finished
+ int64_t start = toolsGetTimestampUs();
+ for (int i = 0; i < threadCnt; ++i) {
+ pthread_join(pids[i], NULL);
+ qThreadInfo *pThreadInfo = infos + i;
+ // total queries
+ g_queryInfo.specifiedQueryInfo.totalQueried += pThreadInfo->nSucc;
+ if (g_arguments->continueIfFail == YES_IF_FAILED) {
+ // yes need add failed count
+ g_queryInfo.specifiedQueryInfo.totalQueried += pThreadInfo->nFail;
+ g_queryInfo.specifiedQueryInfo.totalFail += pThreadInfo->nFail;
+ }
+
+ // destory
+ if (needExit) {
+ benchArrayDestroy(pThreadInfo->query_delay_list);
+ pThreadInfo->query_delay_list = NULL;
+ }
+ }
+ int64_t end = toolsGetTimestampUs();
+
+ // create
+ if (needExit) {
+ errorPrint("failed to create thread. expect nConcurrent=%d real threadCnt=%d, exit testing.\n", nConcurrent, threadCnt);
+ goto OVER;
+ }
+
+ // batch total
+ printf("\n");
+ totalChildQuery(infos, threadCnt, end - start, pDelays);
+
+ // show batch total
+ int64_t delay = end - start;
+ infoPrint("count:%d execute batch spend: %" PRId64 "ms\n", m + 1, delay/1000);
+
+ // sleep
+ if ( g_queryInfo.specifiedQueryInfo.batchQuery && interval > 0) {
+ allSleep += autoSleep(interval, delay);
+ }
+
+ // check cancel
+ if(g_arguments->terminate) {
+ break;
+ }
+ }
+ ret = 0;
+
+ // all total
+ totalBatchQuery(allSleep, pDelays);
+
+OVER:
+ // close conn
+ for (int i = 0; i < connCnt; ++i) {
+ qThreadInfo *pThreadInfo = infos + i;
+ closeQueryConn(pThreadInfo, iface);
+ }
+
+ // free threads
+ tmfree(pids);
+ tmfree(infos);
+
+ // free sqls
+ freeSpecialQueryInfo();
+
+ // free delays
+ if (pDelays) {
+ benchArrayDestroy(pDelays);
+ }
+
+ return ret;
+}
+
// total query for end
void totalQuery(int64_t spends) {
// total QPS
@@ -903,14 +1113,19 @@ int queryTestProcess() {
// start running
//
-
uint64_t startTs = toolsGetTimestampMs();
if(g_queryInfo.specifiedQueryInfo.sqls && g_queryInfo.specifiedQueryInfo.sqls->size > 0) {
// specified table
if (g_queryInfo.specifiedQueryInfo.mixed_query) {
// mixed
- if (specQueryMix(g_queryInfo.iface, g_queryInfo.dbName)) {
- return -1;
+ if(g_queryInfo.specifiedQueryInfo.batchQuery) {
+ if (specQueryBatch(g_queryInfo.iface, g_queryInfo.dbName)) {
+ return -1;
+ }
+ } else {
+ if (specQueryMix(g_queryInfo.iface, g_queryInfo.dbName)) {
+ return -1;
+ }
}
} else {
// no mixied
diff --git a/tools/tdgpt/requirements.txt b/tools/tdgpt/requirements.txt
new file mode 100644
index 0000000000..b123e186e6
--- /dev/null
+++ b/tools/tdgpt/requirements.txt
@@ -0,0 +1,54 @@
+absl-py==2.1.0
+blinker==1.8.2
+click==8.1.7
+contourpy==1.3.0
+cycler==0.12.1
+Cython==3.0.11
+filelock==3.13.1
+Flask==3.0.3
+fonttools==4.54.1
+fsspec==2024.2.0
+h5py==3.12.1
+itsdangerous==2.2.0
+Jinja2==3.1.4
+joblib==1.4.2
+keras==3.6.0
+kiwisolver==1.4.7
+markdown-it-py==3.0.0
+MarkupSafe==3.0.1
+matplotlib==3.9.2
+mdurl==0.1.2
+ml_dtypes==0.5.0
+mpmath==1.3.0
+namex==0.0.8
+networkx==3.2.1
+numpy==1.26.4
+optree==0.13.0
+outlier-utils==0.0.5
+packaging==24.1
+pandas==1.5.0
+patsy==0.5.6
+pillow==10.4.0
+pmdarima==2.0.4
+pyculiarity==0.0.7
+Pygments==2.18.0
+pyparsing==3.1.4
+python-dateutil==2.9.0.post0
+pytz==2024.2
+rich==13.9.2
+rstl==0.1.3
+scikit-learn==1.5.2
+scipy==1.14.1
+six==1.16.0
+statsmodels==0.14.4
+sympy==1.12
+threadpoolctl==3.5.0
+--find-links https://download.pytorch.org/whl/torch/
+torch==2.4.1+cpu
+typing_extensions==4.9.0
+urllib3==2.2.3
+uWSGI==2.0.27
+Werkzeug==3.0.4
+Flask-Testing==0.8.1
+xlsxwriter==3.2.1
+taospy==2.7.16
diff --git a/tools/tdgpt/taosanalytics/algo/ad/autoencoder.py b/tools/tdgpt/taosanalytics/algo/ad/autoencoder.py
index 0d3bb21faa..e58db3f54b 100644
--- a/tools/tdgpt/taosanalytics/algo/ad/autoencoder.py
+++ b/tools/tdgpt/taosanalytics/algo/ad/autoencoder.py
@@ -8,8 +8,8 @@ import numpy as np
import pandas as pd
from taosanalytics.conf import app_logger, conf
-from taosanalytics.misc.train_model import create_sequences
from taosanalytics.service import AbstractAnomalyDetectionService
+from taosanalytics.util import create_sequences
class _AutoEncoderDetectionService(AbstractAnomalyDetectionService):
diff --git a/tools/tdgpt/taosanalytics/app.py b/tools/tdgpt/taosanalytics/app.py
index 682bce012c..7be41489e7 100644
--- a/tools/tdgpt/taosanalytics/app.py
+++ b/tools/tdgpt/taosanalytics/app.py
@@ -160,4 +160,4 @@ def handle_forecast_req():
if __name__ == '__main__':
- app.run()
+ app.run(port=6090)