Commit Graph

22025 Commits

Author SHA1 Message Date
kailixu 9d60e73f5a Merge branch '3.0' into enh/TD-23421-M 2023-04-12 13:10:14 +08:00
kailixu ac841b02bf merge 3.0 2023-04-12 13:09:52 +08:00
Xiaoyu Wang 5d9f3c4133 merge main 2023-04-12 10:44:04 +08:00
Xiaoyu Wang 8b8ac0cd77 merge main 2023-04-12 10:43:28 +08:00
Xiaoyu Wang 9578c4538a Merge remote-tracking branch 'origin/3.0' into fix/3.0_merge_main 2023-04-11 19:33:23 +08:00
Haojun Liao 24c9495772
Merge pull request #20857 from taosdata/fix/TS-3081
fix:optimize log & change the length of tag if tag is null in schemaless
2023-04-11 19:01:07 +08:00
Xiaoyu Wang 2a887dc55e merge main 2023-04-11 17:55:11 +08:00
Xiaoyu Wang 5ce6220106
Merge pull request #20781 from taosdata/szhou/replace-function
feature: udf replace function
2023-04-11 17:25:21 +08:00
dapan1121 81da6cd4a4
Merge pull request #20844 from taosdata/feat/TS-2815
feat(query): INTERP support boolean type
2023-04-11 17:15:05 +08:00
Xiaoyu Wang e3c6f0da24
Merge pull request #20854 from taosdata/fix/TD-23560
fix(udf): make strncat working for release building
2023-04-11 16:47:29 +08:00
dapan1121 6d27154803
Merge pull request #20858 from taosdata/enh/ignoreGetFieldsErrors
enh: stmt ignore get fields errors
2023-04-11 16:01:31 +08:00
Xiaoyu Wang 4d696741b0
Merge pull request #20860 from taosdata/feat/table_level_privilege
feat: table level privilege
2023-04-11 15:56:36 +08:00
Xiaoyu Wang 4c04b155d5 merge main 2023-04-11 15:56:28 +08:00
Xiaoyu Wang 42a5a87e96 fix: table level privilege 2023-04-11 15:08:42 +08:00
wangmm0220 c40c695ea7 fix:optimize log & change the length of tag if tag is null in schemaless 2023-04-11 13:49:18 +08:00
slzhou 41f7d79f2c fix: fix compilation error 2023-04-11 13:42:17 +08:00
shenglian zhou 74f2ba76a4 fix: check uv_is_closing before uv_close 2023-04-11 13:24:20 +08:00
shenglian zhou 6b68a373e9 fix: when update func, set createdtime to original time 2023-04-11 11:37:41 +08:00
dapan1121 28ea375fe1
Merge pull request #20850 from taosdata/enh/ts-3112
enh: add queryMaxConcurrentTables configuration
2023-04-11 11:21:30 +08:00
Ganlin Zhao ea6c96df32 fix memory leak 2023-04-11 11:13:23 +08:00
Xiaoyu Wang 40448c3e70
Merge pull request #20853 from taosdata/feat/table_level_privilege
feat: table level privilege
2023-04-11 11:01:51 +08:00
dapan1121 d99a849956 fix: ignore stmt get fields error 2023-04-11 10:47:15 +08:00
Minglei Jin 8060e77be3 fix(udf): make strncat working for release building 2023-04-11 10:41:35 +08:00
dapan1121 e2b5d27c2a enh: stmt ignore get fields errors 2023-04-11 10:22:47 +08:00
Xiaoyu Wang 416af9a58d feat: table level privilege 2023-04-11 10:11:25 +08:00
xinsheng Ren 965af6cc82
fix: handle leak (#20836)
* fix: handle leak

* fix: del unused code

---------

Co-authored-by: facetosea <25808407@qq.com>
2023-04-11 09:46:06 +08:00
dapan1121 453f6946fb
Merge pull request #20838 from taosdata/szhou/fix-ts3110
fix: select * from (select * from t order by ts desc) order by ts
2023-04-11 09:15:14 +08:00
kailixu 061b54274a Merge branch '3.0' into enh/TD-23421-M 2023-04-11 09:05:44 +08:00
dapan1121 d2f9f2d755 Merge remote-tracking branch 'origin/main' into enh/ts-3112 2023-04-11 09:02:36 +08:00
dapan1121 38231fc48e enh: add queryMaxConcurrentTables configuration 2023-04-11 09:01:19 +08:00
xinsheng Ren bf53345f9d
fix: windows gettime negative value (#20800) 2023-04-11 08:47:31 +08:00
Shuduo Sang 9b6f4e3497
fix: tglobal cus prompt support for windows (#20845)
* chore: refactor cus prompt

* fix: client name in install.sh

* fix: -Wno-reserved-user-defined-literal

* fix: update taos-tools commit

* fix: include/os/osDir.h

* fix: check cus name

* fix: makepkg.sh

* chore: update taos-tools d194dc9

* fix: cus name

* fix: change adapter prefix

* fix: tools/*.sh

* fix: scripts

* fix: ../../packaging/tools/install_client.sh

* chore: cus domain in script

* fix: cus name in packaging/tools/install.sh

* fix: cus name in ../../packaging/tools/remove.sh

* fix: don't edit origin file

* fix: remove brand name

* fix: update taos-tools

* fix: cus name in log

* fix: compile error without cuc name

* fix: source/common/src/tglobal.c

---------

Co-authored-by: chenhaoran <haoran920c@163.com>
2023-04-10 19:44:45 +08:00
Ganlin Zhao 3078e2d487 feat(query): INTERP support boolean type 2023-04-10 18:35:35 +08:00
Xiaoyu Wang 910aba27c0
Merge pull request #20831 from taosdata/feat/table_level_privilege
feat: table level privilege
2023-04-10 17:24:53 +08:00
“happyguoxy” 765c09d59e update function 2023-04-10 16:40:16 +08:00
kailixu 539337ca0b chore: code optimization 2023-04-10 16:12:54 +08:00
Xiaoyu Wang 7984dd93f1 Merge branch 'feat/table_level_privilege_wxy' of github.com:taosdata/TDengine into feat/table_level_privilege_wxy 2023-04-10 15:25:04 +08:00
Xiaoyu Wang e40b978d30 fix: catalog memory leak 2023-04-10 15:24:26 +08:00
kailixu f6078dc27e chore: more code 2023-04-10 15:11:54 +08:00
shenglian zhou 71d59281ff fix: select * from (select * from t order by ts desc) order by ts 2023-04-10 14:03:56 +08:00
kailixu 76386b9fad enh: assign passVer during taos_connect 2023-04-10 13:07:18 +08:00
slzhou b2de711a84 fix: change orReplace logic in mnode 2023-04-10 11:33:25 +08:00
Haojun Liao 0dd1721e57
Merge pull request #20820 from taosdata/fix/TS-3081
fix:add tools to checkout tmq offset & add error log for tmq
2023-04-10 11:02:39 +08:00
Xiaoyu Wang 637bf33c51 fix: catalog unit test 2023-04-10 10:53:29 +08:00
Xiaoyu Wang 4dff8950c2
Merge pull request #20812 from taosdata/fix/TS-3025
fix(tsdb/read): use the correct schema with multilevel merging
2023-04-10 10:30:37 +08:00
Xiaoyu Wang e2f82f4423 merge main 2023-04-10 09:56:03 +08:00
shenglian zhou 65f117822c fix: windows ci error 2023-04-10 06:45:26 +08:00
slzhou b725c9e192 enhance: change udf func body dir to tsDataDir/.udf 2023-04-09 20:31:25 +08:00
kailixu 8c70dca4a9 chore: more code 2023-04-09 19:04:11 +08:00
kailixu 7eb7cb7263 chore: more code 2023-04-09 18:57:04 +08:00