Commit Graph

16101 Commits

Author SHA1 Message Date
Haojun Liao 21046fbb4e [td-255] 2021-05-31 11:56:52 +08:00
lichuang 5276ccc334 [TD-1568]fix tdMergeDataCols bug 2021-05-31 11:56:19 +08:00
Haojun Liao 5262f92733 [td-4321] 2021-05-31 11:43:47 +08:00
Shuduo Sang 7f3fab4993
Feature/sangshuduo/td 4068 taosdemo stmt for master (#6300)
* [TD-4068]<feature>: taosdemo support stmt.

for easy merge purpose. disabled in master.

* fix clang compile error.

* fix memory leak, add more macros. change sqlcount to int

* fix rest segfault.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-05-31 11:39:32 +08:00
dapan1121 0bb4e921c8 support stable 2021-05-31 11:22:50 +08:00
bryanchang0603 39342aec9b [TD-4439] moldifying the test case 2021-05-31 11:16:56 +08:00
bryanchang0603 50d9a1c5a5 [TD-4439] add test case 2021-05-31 11:11:02 +08:00
Shuduo Sang 61fc181487
Feature/sangshuduo/td 4068 taosdemo stmt (#6299)
* merge with develop branch.

change query/tests/CMakeLists.txt to allow unused function and variable.

* refactor data generating.

* refactor.

* refactor.

* refactor.

* refactor.

* refactor

* add prepare stmt function.

* refactor get rand timestamp.

* fix windows compile error.

* copy logic of generate data for stmt.

* insert data basically works now.

* fix windows compile issue.

* [TD-4068]<feature>: taosdemo stmt interface.

stb batch insert works.

* [TD-4068]<feature>: taosdemo support stmt.

normal table insert works.

* [TD-4068]<feature>: taosdemo support stmt.

interlace write works.

* add compile macro to make taosdemo same with master branch.

* fix clang compile error.

* fix memory leak.

* add more macro.

* fix rest segfault.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-05-31 11:01:38 +08:00
Kaili Xu 282eaa3974 sync with master and restore log format 2021-05-31 10:54:22 +08:00
Kaili Xu f805fdeaad Merge branch 'develop' into fix/TD-4324
sync with develop
2021-05-31 10:45:21 +08:00
dapan1121 45b861317c Merge branch 'develop' into feature/TD-4399 2021-05-31 10:27:57 +08:00
Shengliang Guan 1e3d94cc3a
Merge pull request #6297 from taosdata/hotfix/crashgen
[TD-4360]: Change the log output level from error to info
2021-05-31 10:00:05 +08:00
huili f3d95d67ae
Merge pull request #6260 from taosdata/xiaoping/test_case
[TD-4122]<test>: add test case
2021-05-31 09:42:11 +08:00
huili a7e1c34895
Merge pull request #6292 from taosdata/xiaoping/add_test_case
[TD-4420]<test>: add test case
2021-05-31 09:42:02 +08:00
dapan1121 ca4289388c add test case 2021-05-31 09:28:19 +08:00
dapan1121 2ce08b2791 Merge branch 'develop' into feature/TD-4400 2021-05-31 08:16:02 +08:00
Haojun Liao 3b22abb108 [td-255] refactor code. 2021-05-31 00:26:07 +08:00
haojun Liao a176484f08
Merge pull request #6298 from taosdata/fix/develop_typo
Update tscSubquery.c
2021-05-31 00:09:54 +08:00
haojun Liao f58dbc2f4e
Update tscSubquery.c 2021-05-31 00:09:20 +08:00
Shengliang Guan 9291d422c5 [TD-4360]: Change the log output level from error to info 2021-05-30 23:34:12 +08:00
Shengliang Guan 647bb54bfc
Merge pull request #6280 from taosdata/feature/TD-4384
[TD-4384]<fix>: fixed an uninitialized bug
2021-05-30 23:22:11 +08:00
Shengliang Guan 7af1fccb5d
Merge pull request #6284 from taosdata/feature/TD-1920
[TD-1920]load mininal modules,and disable sync wal when compact mnode wal
2021-05-30 23:21:13 +08:00
Shengliang Guan 779ae053ad
Merge pull request #6285 from taosdata/fix/TD-4417
[TD-4417]<fix>: return database not ready if vnode status & role not …
2021-05-30 23:19:11 +08:00
haojun Liao 2e116e2d96
Merge pull request #6261 from taosdata/hotfix/td-4243
[TD-4243]<fix>:fix coredump when select _block_dist() from table
2021-05-30 23:11:33 +08:00
shenglian zhou c60cf34575 [TD-4243]<fix>:fix coredump when select _block_dist() from table 2021-05-30 10:41:08 +08:00
Shuduo Sang 7946d97e33
Feature/sangshuduo/td 4068 taosdemo stmt for master (#6296)
* [TD-4068]<feature>: taosdemo support stmt.

for easy merge purpose. disabled in master.

* fix clang compile error.

* fix memory leak, add more macros. change sqlcount to int

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-05-30 07:03:23 +08:00
Shuduo Sang 32fba9d015
Feature/sangshuduo/td 4068 taosdemo stmt (#6295)
* merge with develop branch.

change query/tests/CMakeLists.txt to allow unused function and variable.

* refactor data generating.

* refactor.

* refactor.

* refactor.

* refactor.

* refactor

* add prepare stmt function.

* refactor get rand timestamp.

* fix windows compile error.

* copy logic of generate data for stmt.

* insert data basically works now.

* fix windows compile issue.

* [TD-4068]<feature>: taosdemo stmt interface.

stb batch insert works.

* [TD-4068]<feature>: taosdemo support stmt.

normal table insert works.

* [TD-4068]<feature>: taosdemo support stmt.

interlace write works.

* add compile macro to make taosdemo same with master branch.

* fix clang compile error.

* fix memory leak.

* add more macro.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-05-30 07:02:51 +08:00
Shuduo Sang daa5205052
Hotfix/sangshuduo/td 4406 taosdemo auto create tables (#6294)
* [TD-4406]<fix>: taosdemo auto create table.

* fix child table exists or auto create logic.

* reduce redundant conditions.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-05-30 07:02:30 +08:00
shenglian zhou 1baeebe908 [TD-4243]<enhance>: block_dist percentile approximation to reduce memory usage especially for super table 2021-05-30 01:23:38 +08:00
shenglian zhou 0c7afcc965 [TD-4243]<enhance>:remove _block_dist() special dedicated column index 2021-05-29 23:35:32 +08:00
haojun Liao 0d4913e039
Merge pull request #6265 from taosdata/feature/TD-4385
[TD-4385]prepare with auto create table
2021-05-29 22:17:07 +08:00
Haojun Liao 6eb29bf2b8 [td-4385] fix bug found by regression test. 2021-05-29 19:35:42 +08:00
Haojun Liao 6d659815be [td-255] fix typo 2021-05-29 19:32:00 +08:00
Haojun Liao d263b2ad19 Merge branch 'feature/query' of https://github.com/taosdata/TDengine into feature/query 2021-05-29 19:30:18 +08:00
Haojun Liao faac9a8d3d [td-4385] fix bug found by regression test. 2021-05-29 19:28:29 +08:00
Ping Xiao 458405cc63 [TD-4423]<test>: add test case 2021-05-29 18:52:56 +08:00
yihaoDeng ff1914af85 merge develop 2021-05-29 17:24:05 +08:00
Ping Xiao d43743e678 [TD-4420]<test>: add test case 2021-05-29 16:24:11 +08:00
Ping Xiao 58c6a90134 Merge branches 'xiaoping/test_case' and 'master' of https://github.com/taosdata/TDengine 2021-05-29 15:58:32 +08:00
Haojun Liao ebd919bc43 [td-4385]fix compiler error on arm32 2021-05-29 15:48:24 +08:00
Haojun Liao be8853ffee [td-4385] merge develop. 2021-05-29 14:46:14 +08:00
haojun Liao 934517b0b4
Merge pull request #6277 from taosdata/hotfix/TD-4411
[TD-4411]taos hangs for invalid character
2021-05-29 14:42:11 +08:00
yihaoDeng 413e09307c [TD-3178]<feature> fix some bug 2021-05-29 14:25:55 +08:00
Haojun Liao 9bfe74aa8c [td-4385] add java api for dynamic create table during insert data. 2021-05-29 14:24:44 +08:00
haojun Liao 5536e81e52
Merge pull request #6242 from taosdata/feature/query
Feature/query
2021-05-29 14:23:13 +08:00
Shuduo Sang 889ed47b56
Hotfix/sangshuduo/td 4406 taosdemo auto create tables for develop (#6288)
* cherry-pick from master branch.

* cherry-pick from master branch. c23043c0ced30f7b1f85b0ae65db405e9fc70b5d

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-05-29 11:52:36 +08:00
Shuduo Sang af7658b002
[TD-4353]<fix>: taosdemo resub if resubAfterConsume != -1 (#6287)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-05-29 09:32:22 +08:00
lichuang 6f7a349f48 [TD-1920]disable log 2021-05-29 09:14:11 +08:00
Shuduo Sang 5456f3a009
Revert "[TD-4533]<fix>: taosdemo resub if resubAfterConsume != -1 (#6243)" (#6289)
This reverts commit 0c4075e09f.
2021-05-29 09:12:19 +08:00
Shuduo Sang 88f3e7aad8
[TD-4353]<fix>: taosdemo resub if resubAfterConsume != -1 (#6286)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-05-29 09:04:13 +08:00