Commit Graph

28844 Commits

Author SHA1 Message Date
Haojun Liao e6a02f7481
Merge pull request #12758 from taosdata/feature/3_liaohj
fix(query): assign the group id in the ssdatablock when generating results.
2022-05-20 17:50:08 +08:00
Cary Xu c91f83aa2b
Merge pull request #12725 from taosdata/feature/TD-13066-3.0
feat: add case for update without multi-version
2022-05-20 17:49:28 +08:00
Cary Xu e9607a9e25 feat: add cases to merge dup data in file and mem 2022-05-20 17:24:10 +08:00
Haojun Liao ee470a9427 other: merge 3.0 2022-05-20 17:12:04 +08:00
Haojun Liao fa84d0585b enh(query): enable remove the candidate table ids in the stream scanner. 2022-05-20 17:07:53 +08:00
Haojun Liao 5e819fbdb3 fix(query): assign the group id in the ssdatablock when generating grouped results. 2022-05-20 16:50:39 +08:00
Zhiqiang Wang e63b64553a
Merge pull request #12755 from taosdata/fix/ZhiqiangWang/fix-14986-disable-win-compile-tests
fix(os): disable win compile tests
2022-05-20 16:49:12 +08:00
afwerar 28b7f9599e fix(os): disable win compile tests 2022-05-20 16:20:15 +08:00
Hongze Cheng 07e54820e6
Merge pull request #12750 from taosdata/fix/hzcheng_3.0
fix:tdb concurrency
2022-05-20 16:05:55 +08:00
Shengliang Guan 292735a1af
Merge pull request #12744 from taosdata/fix/mnode
fix: wrong ref count
2022-05-20 15:54:52 +08:00
Zhiqiang Wang 5d18e75b10
Merge pull request #12751 from taosdata/fix/ZhiqiangWang/fix-14986-disable-win-compile-warning-output
fix(os): disable win compile warning output
2022-05-20 15:45:37 +08:00
Hongze Cheng b563902bb4 make it compile 2022-05-20 07:40:21 +00:00
Cary Xu d2e9f408b0 Merge branch '3.0' into feature/TD-13066-3.0 2022-05-20 15:30:18 +08:00
Hongze Cheng 69e6b4baac Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/hzcheng_3.0 2022-05-20 07:21:40 +00:00
Ganlin Zhao 464a79ac50
Merge pull request #12747 from taosdata/feature/3.0_glzhao
fix(query): change unique function type to non-standard sql function
2022-05-20 15:16:52 +08:00
afwerar 9025abe617 fix(os): disable win compile warning output 2022-05-20 15:14:02 +08:00
Hongze Cheng dc392aae16 Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/hzcheng_3.0 2022-05-20 07:07:59 +00:00
Hongze Cheng 3b4551cc26 fix: tdb concurrency 2022-05-20 07:07:51 +00:00
Ganlin Zhao 98092217ee fix: fix windows compilation error 2022-05-20 14:58:04 +08:00
Ganlin Zhao 3d34f7850e fix(query): change unique function type to non-standard sql function 2022-05-20 13:59:20 +08:00
Xiaoyu Wang c726681009
Merge pull request #12743 from taosdata/feature/3.0_wxy
feat: the scan subplan adds the 'dbFName' attribute for metadata refresh
2022-05-20 13:52:00 +08:00
Hongze Cheng 519c4cdf5d
Merge pull request #12741 from taosdata/fix/hzcheng_3.0
fix: alter table
2022-05-20 13:50:56 +08:00
Shengliang Guan a67e46efc8 fix: invalid code 2022-05-20 13:42:03 +08:00
Shengliang Guan 101d6a482c
Merge pull request #12746 from taosdata/fix/tsim
test: add alter column case for stb
2022-05-20 13:31:00 +08:00
Hongze Cheng 90dff224d8 Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/hzcheng_3.0 2022-05-20 05:30:52 +00:00
Hongze Cheng 366832378e make compile 2022-05-20 05:28:24 +00:00
Shengliang Guan 5057f3cd75 Merge branch '3.0' into fix/mnode 2022-05-20 13:18:34 +08:00
WANG MINGMING c715ee5993
Merge pull request #12719 from taosdata/feature/TD-13041
fea: add select json from table
2022-05-20 13:15:49 +08:00
Shengliang Guan c86c1220f0 Merge remote-tracking branch 'origin/3.0' into fix/mnode 2022-05-20 13:14:25 +08:00
Shengliang Guan 4a7020636a test: add alter column case for stb 2022-05-20 13:11:30 +08:00
Shengliang Guan eddd5b390c refactor: adjust vm worker 2022-05-20 12:48:15 +08:00
Xiaoyu Wang 079f2fb93e feat: the scan subplan adds the 'dbFName' attribute for metadata refresh 2022-05-20 12:47:23 +08:00
wangmm0220 ac6069f343 fix:compile error in windows 2022-05-20 12:45:03 +08:00
Shengliang Guan 3fe92062f1
Merge pull request #12740 from taosdata/fix/dnode
refactor: adjust min shm size
2022-05-20 12:34:09 +08:00
Haojun Liao ff0b38fd49
Merge pull request #12738 from taosdata/feature/3_liaohj
fix(query): set the correct number of expressions.
2022-05-20 12:26:33 +08:00
Hui Li 6230bfe208
Merge pull request #12734 from taosdata/test3.0/lihui
test:add cases for tmq
2022-05-20 12:20:11 +08:00
Hongze Cheng ae8b5220d5 fix: alter table bug 2022-05-20 04:20:01 +00:00
Hongze Cheng d716fb3a55 Merge branch '3.0' of https://github.com/taosdata/TDengine into fix/hzcheng_3.0 2022-05-20 04:11:57 +00:00
Shengliang Guan 7ff241892b Merge remote-tracking branch 'origin/3.0' into fix/mnode 2022-05-20 12:10:19 +08:00
Shengliang Guan 18eb037706 fix: ref count 2022-05-20 12:09:33 +08:00
Haojun Liao 7b55cb0df2 fix(query): set the correct number of expressions. 2022-05-20 12:06:29 +08:00
WANG MINGMING 98be827e39
Merge pull request #12735 from taosdata/feature/TD-14761
fix:invalid data type in schemaless
2022-05-20 11:52:07 +08:00
Haojun Liao 60e34d7934
Merge pull request #12724 from taosdata/feature/3_liaohj
enh(query): limit the rsp ssdatablock size.
2022-05-20 11:33:53 +08:00
wangmm0220 621a7623bf fix:invalid data type in schemaless 2022-05-20 11:33:29 +08:00
plum-lihui 33ce0f2fb6 test:add cases for tmq 2022-05-20 11:27:34 +08:00
Haojun Liao 5809c980e2 fix(query): fix syntax error on windows platform. 2022-05-20 11:11:01 +08:00
Shengliang Guan 7b1833a6f8
Merge pull request #12733 from taosdata/fix/mnode
refactor: adjust vnode sync
2022-05-20 11:09:28 +08:00
Shengliang Guan ff91282bee refactor: adjust vnode sync 2022-05-20 10:51:53 +08:00
Shengliang Guan f2a84eda09 refactor: adjust vnode header file 2022-05-20 10:45:43 +08:00
Shengliang Guan 0f9cd43027 refactor: adjust sync header file 2022-05-20 10:30:30 +08:00