Commit Graph

34412 Commits

Author SHA1 Message Date
Cary Xu 0d6189b4da Merge branch '3.0' into feature/TD-11274-3.0 2022-07-04 19:57:19 +08:00
dapan1121 7f0cc9ca22
Merge pull request #14509 from taosdata/enh/addconverttype
enh: add type convert api
2022-07-04 19:52:35 +08:00
slzhou a380e0cd7c feat: merge condition, on condition and other conditions 2022-07-04 19:49:16 +08:00
Shuduo Sang 86573eda58
chore: update taos tools for3.0 (#14518)
* chore(release): make get_os.sh works on mac

* chore(tools): update taos-tools

* chore: update taos-tools

for 3.0

[TD-16450]
2022-07-04 19:48:45 +08:00
Shengliang Guan 5405ac08d9
Merge pull request #14514 from taosdata/fix/tsim
enh: check available memory of dnode while creating db
2022-07-04 19:42:42 +08:00
Yihao Deng 7ae8787cef
Merge pull request #14511 from taosdata/enh/killQuery
enh: enhance kill query processing
2022-07-04 19:39:32 +08:00
Xiaoyu Wang ac34cde0af fix: increase the validity check of the rollup parameter in the create table statement 2022-07-04 19:27:27 +08:00
Hongze Cheng 64b1400d7c Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_snapshot 2022-07-04 11:25:41 +00:00
Hongze Cheng 27b719febd refact some code 2022-07-04 11:24:54 +00:00
dapan1121 83cbc41088 fix: fix explain crash issue 2022-07-04 19:12:21 +08:00
Shengliang Guan 63e3529e0f fix: system memory not set in ut 2022-07-04 19:03:10 +08:00
jiacy-jcy 3b50fee6cb Merge branch '3.0' into 3.0test/jcy 2022-07-04 18:57:43 +08:00
yihaoDeng f213212faf fix compile error 2022-07-04 18:57:06 +08:00
Hongze Cheng d1cf93e435 Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_snapshot 2022-07-04 10:55:09 +00:00
Hongze Cheng 56913abdbf more work 2022-07-04 10:55:01 +00:00
jiacy-jcy 59964f7e6c update 2022-07-04 18:54:37 +08:00
Ganlin Zhao cce9f262aa
Merge pull request #14507 from taosdata/fix/TD-16948
refactor(query): remove redundant param check in function execution context
2022-07-04 18:52:53 +08:00
Ganlin Zhao 833fbca95e
Merge pull request #14512 from taosdata/fix/TD-17032
fix(query): fix timetruncate/timediff local variable overwrite issue
2022-07-04 18:52:37 +08:00
Li Minghao c45e0d5112
Merge pull request #14513 from taosdata/feature/3.0_mhli
refactor(sync): add sync strategy
2022-07-04 18:40:41 +08:00
Shengliang Guan 07fa747429 fix: valgrind error 2022-07-04 18:30:10 +08:00
Minghao Li eae44cd9df refactor(sync): add error code sync-timeout 2022-07-04 18:10:40 +08:00
Ganlin Zhao 6e98552eca fix(query): fix timetruncate/timediff local variable overwrite issue
TD-17032
2022-07-04 17:54:49 +08:00
Shengliang Guan c58a84750e Merge remote-tracking branch 'origin/3.0' into fix/tsim 2022-07-04 17:54:25 +08:00
Shengliang Guan 3cc215bdcc fix: crash while write wal in multi-threaded way 2022-07-04 17:54:00 +08:00
Shengliang Guan 630eebecd5 enh: check available memory of dnode while creating db 2022-07-04 17:50:35 +08:00
dapan1121 37b303f531 Merge branch '3.0' into enh/killQuery 2022-07-04 17:45:03 +08:00
dapan1121 57836d8bb2 enh: add type convert api 2022-07-04 17:40:20 +08:00
Hui Li fb24e6d005
Merge pull request #14500 from taosdata/test3.0/lihui
test: add test case for tmq
2022-07-04 17:33:37 +08:00
Ganlin Zhao 09c6fd9c09
Merge pull request #14498 from taosdata/fix/TD-16972
fix(query): add histogram function parameter check
2022-07-04 17:23:29 +08:00
Xiaoyu Wang 047f65935d fix: automatically supplement primary key columns when creating stream 2022-07-04 17:21:42 +08:00
Ganlin Zhao 600e992820 Merge branch 'fix/TD-16948' of github.com:taosdata/TDengine into fix/TD-16948 2022-07-04 17:16:18 +08:00
Ganlin Zhao e90ec32620 Merge branch '3.0' into fix/TD-16948 2022-07-04 17:15:51 +08:00
Xiaoyu Wang c943710a8a
Merge pull request #14504 from taosdata/feature/3.0_debug_wxy
fix: sort operator exception error
2022-07-04 17:15:11 +08:00
Ganlin Zhao af6a9abfde refactor(query): remove redundant param check on function execution
context

TD-17029
2022-07-04 17:14:22 +08:00
Ganlin Zhao e4053ed903 refactor(query): remove redundant param check on function execution
context
2022-07-04 17:13:22 +08:00
Minglei Jin a4cfb51b99 tsdbReaderWriter: fix windows compiling issue 2022-07-04 17:03:53 +08:00
Ganlin Zhao 523d709687
Merge pull request #14501 from taosdata/fix/TD-16948
fix(query): disable histogram to be used with indefinite rows function in projection
2022-07-04 17:01:50 +08:00
Minglei Jin 244dcbed5d Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-07-04 16:58:59 +08:00
Minglei Jin 9aa5ee6ccf tsdbCache: fix row duplication 2022-07-04 16:58:42 +08:00
Hongze Cheng e34ad23c01 Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_snapshot 2022-07-04 08:31:25 +00:00
Hongze Cheng de60ec37b6 fix CI bug 2022-07-04 08:26:16 +00:00
Xiaoyu Wang 8b486765d3 fix: sort operator exception error 2022-07-04 16:23:38 +08:00
Minghao Li 59f015a121 refactor(sync): add error code sync-timeout 2022-07-04 16:22:02 +08:00
Xiaoyu Wang 2450d5982b
Merge pull request #14450 from taosdata/feature/3.0_debug_wxy
fix: some problems of parser and planner
2022-07-04 16:18:45 +08:00
yihaoDeng 47ec187231 merge int kill 2022-07-04 16:10:59 +08:00
Cary Xu 23a0318604 Merge branch '3.0' into feature/TD-11274-3.0 2022-07-04 16:09:29 +08:00
Minghao Li 6e59c13cbd refactor(sync): add sync strategy 2022-07-04 15:57:28 +08:00
Yihao Deng 8d8df859cc
Merge pull request #14495 from taosdata/fix/invaldRead
fix: invalid read/write
2022-07-04 15:37:50 +08:00
Minghao Li 0c1a46c26e refactor(sync): add sync strategy 2022-07-04 15:29:55 +08:00
Hongze Cheng 05af34a527 more code 2022-07-04 07:26:52 +00:00