Commit graph

303 commits

Author SHA1 Message Date
Mario Peng
c625106609
fix(stmt2):stmt2 get fields return wrong when tag is value (#30283)
* ci: add 3.3.6 branch

* fix: delete taos-tools repo in Jenkinsfile2

* ci:add 3.3.6 branch to taosd-ci.yml

* fix: [TD-34074] compile error (#30220)

* fix: add case

* fix: stmt2 get fields return wrong when tag is value

* enh: replace preCtb bool to flag,handle more situation

* fix: some unit test error

* diff: add case and fix some problem

* fix: remove async test, handle in TD-34077

* fix: [TD-34074] Forbid virtual table in tq and stmt and forbid supertable query's origin table from different databases.

fix: [TD-34074] Forbid virtual table in tq and stmt and forbid supertable query's origin table from different databases.

* fix(sml): process space in the end if writing raw data in sml & change some log level  #30306

 fix(sml): process space in the end if writing raw data in sml & change some log level

* fix: taosadapter version 3.3.6 (#30324)

* docs(stream): document streaming computation support for virtual tables in user manual (#30319)

* docs(stream): document streaming computation support for virtual tables in user manual

- Added section to user manual describing streaming computation support for virtual tables
- Listed known limitations and behavior when using virtual tables in streaming mode

* Update 14-stream.md

---------

Co-authored-by: Pan Wei <72057773+dapan1121@users.noreply.github.com>

* fix: review

* ci: add tdgpt .c file into TDengine and TDgpt workflow

* ci: add tdgpt .c file into TDengine and TDgpt workflow

---------

Signed-off-by: WANG Xu <feici02@outlook.com>
Co-authored-by: WANG Xu <feici02@outlook.com>
Co-authored-by: haoranchen <haoran920c@163.com>
Co-authored-by: Simon Guan <slguan@taosdata.com>
Co-authored-by: Feng Chao <flyingangel_2008@163.com>
Co-authored-by: facetosea <285808407@qq.com>
Co-authored-by: Jing Sima <simondominic9997@outlook.com>
Co-authored-by: Jinqing Kuang <kuangjinqingcn@gmail.com>
Co-authored-by: dapan1121 <wpan@taosdata.com>
Co-authored-by: Pan Wei <72057773+dapan1121@users.noreply.github.com>
Co-authored-by: Haojun Liao <hjxilinx@users.noreply.github.com>
Co-authored-by: huohong <346479823@qq.com>
Co-authored-by: Minglei Jin <mljin@taosdata.com>
Co-authored-by: freemine <freemine@yeah.net>
Co-authored-by: Yihao Deng <luomoxyz@126.com>
Co-authored-by: 54liuyao <54liuyao@163.com>
Co-authored-by: Bomin Zhang <localvar@hotmail.com>
Co-authored-by: 蟑螂·魂 <cockroach888@outlook.com>
Co-authored-by: wangjiaming <wangjiaming0909@sina.com>
Co-authored-by: Haojun Liao <hjliao@taosdata.com>
Co-authored-by: dongming chen <cademfly@hotmail.com>
Co-authored-by: Zhiyu Yang <69311263+zyyang90@users.noreply.github.com>
Co-authored-by: Nie Minhui <143420805+minhuinie@users.noreply.github.com>
Co-authored-by: Zhixiao Bao <62235797+xiao-77@users.noreply.github.com>
Co-authored-by: Kaili Xu <klxu@taosdata.com>
Co-authored-by: Linhe Huo <linhehuo@gmail.com>
Co-authored-by: tjuzyp <ypzhang@taosdata.com>
Co-authored-by: yanyuxing <yuxing.bitcapybara@gmail.com>
Co-authored-by: WANG MINGMING <wangmm0220@gmail.com>
Co-authored-by: yihaoDeng <yhdeng@taosdata.com>
Co-authored-by: facetosea <25808407@qq.com>
Co-authored-by: Minglei Jin <49711132+stephenkgu@users.noreply.github.com>
Co-authored-by: She Yanjie <57549981+sheyanjie-qq@users.noreply.github.com>
Co-authored-by: jiajingbin <39030567+jiajingbin@users.noreply.github.com>
Co-authored-by: Alex Duan <51781608+DuanKuanJun@users.noreply.github.com>
Co-authored-by: kevin men <men_shi_bin@163.com>
Co-authored-by: Hongze Cheng <hzcheng@taosdata.com>
Co-authored-by: Yaming Pei <sanwenyuv@sina.com>
Co-authored-by: Xuefeng Tan <1172915550@qq.com>
2025-03-22 21:14:08 +08:00
Alex Duan
c133489917
new-libtaos-with-ws (#29971)
* enh: rename libtaos.so to libtaosinternal.so

* enh: let python system-test work

* enh: shell for libinternal.so

* enh: refact script

* enh: wrapper for libtaosinternal

* enh: rename some files

* enh: let shell support internal driver

* enh: minor changes

* enh: minor changes

* add intenal.h

* enh: remove unused codes

* enh: minor changs

* feat: mac os issues

* enh: let python test use internal connection

* enh: let nettest work

* enh: let taosc -C work

* enh: test shell in mac os

* enh: minor changes

* enh: let libtaosinternal.so work in linux

* enh: update install script

* enh: for ci

* enh: for windows compile

* enh: minor changes

* enh: compile in windows

* enh: minor changes

* enh: taosinternal work in windows

* enh: add taos_internal_static

* enh: rollback os_for_wrapper

* fix: conflicts

* fix: conflicts

* fix: compile errors

* fix: conflicts

* enh: rename taosinternal to taosnative

* enh: rename taosinternal to taosnative

* fix: compile error

* enh: remove taosnative.h

* fix: compile errors

* enh: set default shell options

* fix: compile errors

* fix: compile errors

* debug: switch taosws branch to feat/new-libtaos-with-ws

* enh: taosBenchmark remove WEBSOCKET finished

* fix: CMakeLists.txt remove WEBSOCKET

* fix: compile errors

* fix: taosBenchmark delete restful code

* .gitignore remove taos-tools folder

* fix: remove taosdump WEBSOCKET MACRO

* fix: build error for taosdump

* fix: build project passed

* fix: support -Z for connect mode

* fix: build error

* fix: build error fixed

* fix: add -Z options

* fix: native and websocket with string

* fix: -Z option core

* fix: build unit test

* fix: build error

* fix: add colon for array

* fix: unit test can not include fun

* fix: CTest pointer null is nullptr

* fix: include pub.h

* fix: taosdump add -Z --driver options

* fix: taosdump support -Z with pub.h pub.c

* fix: toolsGetTimeDay move to pub.c

* fix: restore pub.c only simple fun

* fix: add error tips

* fix: tmfree remove from taosdump

* fix: remove double declare taos variant

* fix: taos support -Z option

* enh: configDir set with main fun

* fix: add g_arguments.configDir

* fix: show tips add cfgdir

* fix: g_argument is pointer

* fix: configDir is global var

* fix: declare g_configDir in benchMain.c

* fix: taos version not show on websocket

* stmt2 websocket prepare with supertable

* stmt2 websocket prepare build

* fix: stmt and stmt2 prepare add db name

* fix: remove -R --restful test case

* fix: taosBenchmark adjust priority cmd > json > evn

* fix: add connect mode test case connMode.py

* fix: clear evn and add host port check

* fix: army/test.py modify start taosAdapter is default

* change: system-test/test.py default start taosAdapter

* fix: add taosAdapter variant to system-test/test.py

* fix: -y must put behind other options

* fix: remove rest sml and add -N normal case

* fix: add -c work cfg test case

* del: queryMain.py remove rest query

* fix: remove groups have a blank append bug

* fix: caseBase.py add db in sql query

* fix: query_json.py remove rest test

* fix: taosBenchmark uniform dsn describe

* fix: add pub.h pub.c to tools public

* fix: case remove restful interface

* fix: build error

* fix: taosDriverCleanup no arg call

* fix: taosdump add test conn mode case taosdumpCommandline.py

* fix: modify insertFullType.json db name

* fix: taosdump connMode test case taosDumpCommandline.py passed

* enh: priority cmd > env > json

* fix: taosCli remove is_native variant

* fix: password is not pointer

* fix: comment -o test case

* fix: solve fun return code check

* fix: windows unresolved strcasecmp

* fix: remove coverHostToServAddr

* fix: forbid check ODR violation

* ci: trigger pr run

* fix: build error not del >>>>>3.0

* fix: support json dbinfo->vgroups have blank space

* fix: solve conflict with merge

* fix: with TrimCaseCmp fun to compare vgroups

* fix: del vgroups support blank code

* feat: wrapper add taos_fetch_fields_e

* fix: move jni from libtaosnative.so to libtaos.so

* fix: move clientTmqConnector.c for jni

* fix: fix assert check with del comment code

* fix: taosBenchmark add prepare stmt debug log

* fix: stmt2 already have debug log on preapare

* fix:  (double)LLONG_MAX force covert

* fix: stmt insert normal table with websocket

* fix: normal table with stmt too many ?

* fix: taosdump stmt_prepare with child tbname

* fix: build error add int code

* feat: stmtPrepare with child table to do

* taos -a options move to native test case

* fix:unit test benchmarkTest passed

* fix: query_json-with-sqlfile.py case no check results

* fix: queryMain.py case lost, put in tasks again

---------

Co-authored-by: Shengliang Guan <slguan@taosdata.com>
2025-03-20 22:54:29 +08:00
WANG MINGMING
3bc6635de3
feat[TS-6115]: support deletion of topics with active consumers. (#30232)
* feat[TS-6115]: drop topic & consumer group in force

* feat[TS-6115]: drop topic & consumer group in force

* feat[TS-6115]: drop topic & consumer group in force
2025-03-18 14:11:00 +08:00
wangjiaming
f50fcb85b8
feat(decimal): support decimal data type (#30060)
* decimal: create table

* decimal: add test case decimal.py

* decimal: add decimal.c

* support input decimal

* decimal test

* refactor svalue

* fix test cases

* add decimal unit test

* add decimal test cmake

* support insert and query decimal type

* define wide integer, support decimal128

* support decimal128 divide

* set decimal type expr res types

* scalar decimal

* convert to decimal

* fix decimal64/128 from str and to str

* fix decimal from str and decimal to str

* decimal simple conversion

* unit test for decimal

* decimal conversion and unit tests

* decimal + - * /

* decimal scalar ops and comparision

* start to refactor GET_TYPED_DATA

* support decimal max func, cast func

* refactor GET_TYPED_DATA interface

* decimal scalar comparision

* start to implement sum for decimal

* support sum and avg for decimal type

* decimal tests

* add decimal test

* decimal add test cases

* decimal use int256/int128

* decimal testing

* fix decimal table meta and add tests for decimal col streams

* fix create stream and create tsma

* test insert decimal values

* decimal from str

* test decimal input

* test parse decimal from string

* add taos_fetch_field_e api

* decimal insert tests

* test decimal operators

* decimal operator test

* feat:support decimal in raw block

* decimal operator tests

* decimal test

* feat:support decimal in raw block

* feat:support decimal in raw block

* feat:add schemaExt to SMqDataRsp

* feat:remove add schemaExt to SMqDataRsp

* feat:remove add schemaExt to SMqDataRsp

* feat:remove add schemaExt to SMqDataRsp

* decimal test operators

* decimal operator test

* test decimal operators

* test decimal compare operators

* decimal unary operator test

* decimal col with decimal col oper test

* test decimal col filtering

* fix decimal float operator test

* decimal test where filtering

* fix decimal filtering

* fix decimal order by

* fix decimal op test

* test decimal agg funcs

* test decimal functions

* remove assert

* fix ci build for ret check

* fix decimal windows build

* fix ci ret check

* skip decimal ret check

* skip decimal ret check

* fix decimal tests

* fix decimal ci test

* decimal test

* fix(tmq): heap user after free

* fix(tmq): double free

* fix(tmq): double free

* fix decimal tests

* fix(decimal): decimal test ci build

* fix(decimal): windows build

* fix(decimal): decimal test build

* fix(decimal): fix decimal build and tests

* fix(decimal): fix decimal tests

* fix(decimal): fix taos_fetch_fields_e api

* fix(decimal): fix decimal taos_fetch_fields_e api

* fix(decimal): rebase 3.0

* fix(decimal): fix decimal functions

* fix(decimal): fix decimal test case memory leak

* fix(decimal): fix decimal tests

* fix(decimal): fix decimal test case

* fix(decimal): fix decimal tests

* feat(decimal): fix unit tests

* feat(decimal): fix deicmal unit test

---------

Co-authored-by: wangmm0220 <wangmm0220@gmail.com>
Co-authored-by: yihaoDeng <yhdeng@taosdata.com>
2025-03-14 18:08:07 +08:00
Kaili Xu
13f9bddf3d
feat: support customized taos/taosd (#29736)
* feat: support TDAcoreOS

* chore: cmake options for TD_ACORE

* chore: disable lemon for TD_ACORE

* chore: add lzma2 and msvcregex

* chore: cmake for lzma2

* chore: adapt for TD_ACORE

* chore: adapt strcasecmp for TD_ACORE

* chore: adapt for geos/threadName

* chore: build adapt for TD_ACORE

* chore: build adapt for TD_ACORE

* chore: build adapt for TD_ACORE

* chore: build adapt for TD_ACORE

* chore: build adapt for TD_ACORE termio

* chore: refact transComm.h for TD_ACORE

* chore: refact transportInt.h for TD_ACORE

* chore: refact trans.c for TD_ACORE

* chore: refact trpc.h for TD_ACORE

* chore: refact transCli.c/transComm.c/transSvr.c for TD_ACORE

* chore: refact uv.h for TD_ACORE

* chore: refact geosWrapper.h for TD_ACORE

* chore: refact token/builtins/udf for TD_ACORE

* chore: refact rocks for TD_ACORE

* chore: refact tsdbCache.c for TD_ACORE, use LRU cache for last/last_row, not use rocksdb

* chore: refact FAIL to _ERR to solve conflicts for TD_ACORE

* chore: restore lemon.c/lempar.c

* chore: support build lemon for TD_ACORE

* chore: refact trpc and siginfo_t for TD_ACORE

* chore: refact timezone for TD_ACORE

* chore: refact lz4 for TD_ACORE

* chore: refact TD_ACORE to make compile pass

* chore: code optimization for TD_ASTRA

* feat: support run taos with taosd integrated

* feat: support invoke taos shell

* feat: support invoke taos shell

* feat: support invoke taos shell

* chore: code optimization

* chore: fix undefined reference problem os TD_ASTRA

* chore: resolve compile problem for TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix undefined reference problem os TD_ASTRA

* chore: fix getpid

* chore: fix typo

* chore: set stack size and ajust min pack size for TD_ASTRA

* chore: fix pthread create parameters

* chore: chmod adapt for TD_ASTRA

* chore: fix trans compile problem

* chore: adapt chmod for TD_ASTRA

* chore: byte alignment for TD_ASTRA

* chore: more code for adaption of TD_ASTRA

* chore: more code for adaption of TD_ASTRA

* chore: more code for adaption of TD_ASTRA

* chore: byte alignment for TD_ASTRA

* chore: conditional compile option

* chore: adapt for TD_ASTRA

* chore: adjust taosPId and msvcregex for TD_ASTRA

* chore: log dir separator for wal build name

* chore: fix type of pointer parameter

* chore: fix compile problem of tsdbGetS3Size

* enh: get last ver from wal log for TD_ASTRA

* enh: refact wal meta ver

* enh: refact wal meta ver

* fix: typo of taosUcs4Compare

* enh: process return value of CI

* chore: more code for TD_ASTRA adaption

* chore: return value of taosCloseFile in walMeta.c

* chore: fix compile problem

* chore: fix compile problem of TD_ASTRA

* fix: update macro for tq and stream task

* chore: code optimization for TD_ASTRA

* chore: restore create log and init cfg interface

* chore: restore strncasecmp and strcasecmp

* fix: adjust the field position of SDataBlockInfo

* fix: pragma pack min size

* fix: pragma pack min size

* chore: more code for TD_ASTRA adaption

* fix: type of parameters

* chore: adapt strncasecmp and strcasecmp for TD_ASTRA

* chore: restore interface of init log

* enh: pack push optimization

* fix: taos init cfg

* add astra support

* fix: fetch the value of suid

* chore: switch of  build with udf

* add temp code

* chore: more code for TD_ASTRA adaption

* chore: add macro ERRNO to replace errno

* chore: bytes align for TD_ASTRA

* fix: remove obsolete codes

* enh: support USE_UDF macro

* fix compile error

* fix: resolve redefinition problem

* fix: compile problem of log.cpp

* fix: compile problem of osTimezone

* fix: resolve compile problem of udf

* fix: pragma definition on windows

* fix: ucs4 and stpncpy for TD_ASTRA

* fix: memory align problem for TD_ASTRA

* enh: solve memory leak for TD_ASTRA_RPC

* fix: compile problem of taosSetInt64Aligned

* fix: restore mndSubscribe.c

* fix: scalar for udf

* chore: code adaption for TD_ASTRA

* chore: code optimization for TD_ASTRA

* fix: typo of add definition

* fix: typo of macro in tudf.h

* chore: remove void to make CI pass

* enh: move macro from cmake.platform to cmake.options

* enh: byte align for hash node and error code

* chore: restore the size for lru cache

* enh: restore some code about pack push

* chore: restore the pack push in tmsg.h

* fix: add macro of pack pop for windows

---------

Co-authored-by: yihaoDeng <luomoxyz@126.com>
2025-03-14 13:32:13 +08:00
Simon Guan
e59db69c24 refactor: cmake files 2025-03-06 13:46:15 +08:00
wangmm0220
9a3d6e3fb3 fix: remove waitting for empty block & optimize poll logic 2025-03-05 09:32:45 +08:00
wangmm0220
08601c5dc9 fix: remove waitting for empty block & optimize poll logic 2025-03-05 09:32:45 +08:00
wangmm0220
e594c2bbd5 feat:[TD-33798]modify metadata logic for tmq 2025-02-21 11:49:17 +08:00
Shengliang Guan
86ea533b36 Merge branch '3.0' into merge/mainto3.03 2025-02-20 11:38:43 +08:00
Shengliang Guan
d0eb99809f Merge branch 'main' into merge/mainto3.03 2025-02-20 11:38:41 +08:00
wangmm0220
bdfa67e4a9 fix:[TS-5928]add consumer parameters 2025-02-18 17:32:00 +08:00
wangmm0220
425edfad72 fix:[TD-33755]set tag=false error in tmq_get_json 2025-02-18 15:01:57 +08:00
wangmm0220
bf5dc63a30 fix:[TS-5776]add test case 2025-02-17 17:40:54 +08:00
wangmm0220
b5edb79d48 fix:[TS-5776]add raw type from consumer 2025-01-24 16:55:53 +08:00
wangmm0220
9074a999d0 fix:[TS-5776]add raw type from consumer 2025-01-24 15:08:01 +08:00
wangmm0220
ba9892bae0 fix:[TD-32471]set error code to terrno if tmq_consumer_poll return NULL 2025-01-08 16:50:38 +08:00
wangmm0220
3ac57587b2 fix:[TD-32471]set error code to terrno if tmq_consumer_poll return NULL 2025-01-08 15:54:34 +08:00
wangmm0220
5cdbebbcd8 fix:[TD-32471]set error code to terrno if tmq_consumer_poll return NULL 2025-01-02 11:01:00 +08:00
wangmm0220
226701ad14 fix:[TD-32471]set error code to terrno if tmq_consumer_poll return NULL 2024-12-31 16:48:23 +08:00
wangmm0220
a1e20680f7 fix:[TD-33272]add test case 2024-12-23 15:57:49 +08:00
Shengliang Guan
5e59081640 Merge branch 'main' into merge/mainto3.0 2024-12-11 05:42:38 +00:00
Shengliang Guan
fc177f405f fix: ci errors 2024-12-11 02:46:55 +00:00
Shengliang Guan
3dea56f431 fix: ci errors 2024-12-10 15:15:17 +00:00
wangmm0220
0165684131 feat:[TD-32642] merge from 3.0 2024-12-05 23:47:46 +08:00
wangmm0220
931a40985c feat:[TD-32642] add timezone support in windows 2024-12-04 10:53:33 +08:00
Shengliang Guan
1c3af7500e
Merge pull request #28953 from taosdata/merge/mainto3.0
merge: from main to 3.0 branch
2024-11-28 16:39:06 +08:00
Shengliang Guan
26ba4b1f29 Merge branch '3.0' into merge/mainto3.0 2024-11-27 22:32:50 +08:00
Shengliang Guan
6db8a25c98 Merge branch 'main' into merge/mainto3.0 2024-11-27 22:31:17 +08:00
wangmm0220
a64c6b6ce1 fix:[TD-33048] add ts to cols if dataFormat is true in schemaless to avoid schemal is old 2024-11-27 19:09:38 +08:00
wangmm0220
edba0063aa fix:[TD-33048] add ts to cols if dataFormat is true in schemaless to avoid schemal is old 2024-11-27 18:26:35 +08:00
wangmm0220
2ca9f9c8ce feat:[TD-32642] merge from 3.0 2024-11-26 00:13:43 +08:00
wangmm0220
c7d0f69ca4 feat:[TD-32642] add timezone logic 2024-11-25 23:43:37 +08:00
Shengliang Guan
00d01ac867
Merge pull request #28907 from taosdata/fix/TS-5679
fix:[TS-5679] auto commit error
2024-11-25 15:28:58 +08:00
wangmm0220
e11adb498b fix:[TS-5679] auto commit error 2024-11-24 21:26:56 +08:00
wangmm0220
4a9d2dbf44 fix:[TS-5679] auto commit error 2024-11-24 21:21:26 +08:00
wangmm0220
e3b5c61699 fix:[TS-5679] auto commit error 2024-11-24 21:05:29 +08:00
Shengliang Guan
877dbd8e90 fix: complie errors 2024-11-22 22:19:42 +08:00
wangmm0220
69da972796 feat:[TD-32642] add timezone logic 2024-11-22 18:31:51 +08:00
Shengliang Guan
2d13ce5105 refact: rename taos lib name 2024-11-22 15:33:55 +08:00
yihaoDeng
f9d67724d9 fix test case 2024-11-14 22:20:25 +08:00
yihaoDeng
ded0e954ba update case 2024-11-14 21:12:19 +08:00
Shengliang Guan
765a0f4a03
Merge pull request #28589 from taosdata/enh/TS-5441-3.0
fix:[TS-5441] error if cols not equal in write_raw_block
2024-10-31 17:36:58 +08:00
Shengliang Guan
6aafc047b2
Merge pull request #28435 from taosdata/fix/TD-32166
enh:[TD-32166]refactor code in sml
2024-10-31 15:34:08 +08:00
wangmm0220
3a66d2fb3b fix:[TS-5441] error if cols not equal in write_raw_block 2024-10-31 14:51:56 +08:00
yihaoDeng
b523cf8802 fix:conflicts from 3.0 2024-10-28 17:34:20 +08:00
wangmm0220
bd81eeccd0 enh:[TD-32166]refactor code in sml 2024-10-24 23:54:12 +08:00
wangmm0220
35d3d968ff enh:[TD-32166]refactor code in sml 2024-10-24 18:55:37 +08:00
wangmm0220
4090aad6fd enh:[TD-32166]refactor code in sml 2024-10-24 16:18:39 +08:00
wangmm0220
75c8727c52 enh:[TD-32166]refactor code in sml 2024-10-24 15:48:57 +08:00