Commit Graph

8949 Commits

Author SHA1 Message Date
dapan1121 a1c69e5a07 fix taosd crash issue 2021-04-02 18:21:19 +08:00
haojun Liao 251f20164f
Merge pull request #5634 from taosdata/hotfix/TD-3569
[TD-3569]fix taosd mem leak issue
2021-04-02 18:19:59 +08:00
Shengliang Guan 0efdcdfd4e change fwds info save size 2021-04-02 09:52:34 +00:00
Shengliang Guan 2489d1f3c7 [TD-3458]<fix>: Fix the bug of losing tables in multiple replicas 2021-04-02 09:31:56 +00:00
Shuduo Sang 945013bd11
[TD-3653] <fix>: taosdemo json parameter cleanup. (#5665)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-04-02 17:09:13 +08:00
root 9a922281ab fix bug 2021-04-02 08:06:48 +00:00
dapan1121 9870637abc fix negative time expression 2021-04-02 14:40:37 +08:00
Haojun Liao 69587b3c29 [td-225]fix memory leaks. 2021-04-02 13:45:55 +08:00
Haojun Liao 25d959b944 [td-225]fix error in import files. 2021-04-02 12:23:51 +08:00
haojun Liao fac6dfc22a
Merge pull request #5613 from taosdata/hotfix/TD-3590
[TD-3590]stddev with group by column fail issue
2021-04-02 11:47:33 +08:00
dapan1121 855c5b0ec1 fix windows compile error 2021-04-02 11:43:46 +08:00
dapan1121 83fef54bc2 fix windows compile error 2021-04-02 11:36:11 +08:00
Haojun Liao a772612b2f [td-225]fix compiler warning. 2021-04-02 11:21:51 +08:00
Haojun Liao 1f4c2cf526 [td-225]refactor. 2021-04-02 11:18:36 +08:00
dapan1121 2df1702dae fix compile error in arm64 2021-04-02 10:12:35 +08:00
Shengliang Guan 1e85026615
Merge pull request #5646 from taosdata/feature/TD-3628
add connection timeout
2021-04-02 10:00:56 +08:00
dapan1121 219bc838e5 Merge branch 'develop' into feature/TD-2577 2021-04-02 09:36:36 +08:00
Shuduo Sang 16d7fcc2a2
[TD-3641] <fix>: fix interlace timestamp step issue. (#5654)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-04-02 09:35:02 +08:00
dapan1121 91f78d4a4b fix free issue 2021-04-02 09:30:59 +08:00
huili 76ed44f69c
Merge pull request #5652 from taosdata/fix/TD-3642
[TD-3642]<fix>: fix staging directory resource leak
2021-04-02 09:10:22 +08:00
haojun Liao dfd365f02d
Merge pull request #5643 from taosdata/feature/qrefactor
[td-225]fix a invalid read.
2021-04-01 22:34:08 +08:00
huili f167bd6cc8
Merge pull request #5650 from taosdata/fix/TD-3612
[TD-3612]<fix>: fix vnode write msg double free issue
2021-04-01 19:32:47 +08:00
Shuduo Sang c91fccf29c
Hotfix/sangshuduo/td 3633 taosdemo segfault (#5649)
* [TD-3633] <fix>: fix taosdemo segfault.

* [TD-3633] <fix>: fix taosdemo segfault.

use snprintf instead of sprintf.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-04-01 17:49:19 +08:00
dapan1121 c507d0c2e2 fix bug 2021-04-01 17:03:36 +08:00
dapan1121 af7b50c439 fix issue 2021-04-01 16:59:39 +08:00
dapan1121 80e0d0eff1 Merge branch 'develop' into feature/TD-2577 2021-04-01 16:51:01 +08:00
dapan1121 71badf8c85 fix filter error 2021-04-01 16:41:21 +08:00
Shuduo Sang e39762deb1
Hotfix/sangshuduo/td 3631 max stb count (#5645)
* [TD-3631] <fix>: increase max super table count to 10000

* [TD-3631] <fix>: use smaller max stb count due to data structure limit.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-04-01 16:06:25 +08:00
Minglei Jin e2ed5b9460 [TD-3642]<fix>: fix staging directory resource leak 2021-04-01 16:03:38 +08:00
dapan1121 dc9c503f05 free issue 2021-04-01 15:31:31 +08:00
zyyang 598b1ce6bf
Feature/td 3411 (#5648)
* [TD-3410]feature: adapted to nutz

* change

* change

* change

* change

* [TD-3447]<feature>: JDBC-RESTful and JDBC-JNI support setObject

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* [TD-3548]<feature>: support ParameterMetaData in JDBC-RESTful and JDBC-JNI

* change

* change

* [TD-3446]<feature>: JDBC-JNI and JDBC-RESTful do not need invoke Class.forName any more

* change jdbc version

* change

* change

* change

* change

* change

* change

* change

* change

* change version
2021-04-01 15:16:36 +08:00
Minglei Jin 4aebd5bdf6 [TD-3612]<fix>: fix vnode write msg double free issue 2021-04-01 15:13:54 +08:00
Haojun Liao b74d5b729f [td-225]fix bugs by regression test. 2021-04-01 15:07:30 +08:00
Haojun Liao 253ca7d025 [td-3457]<fix>: fix the bug that cancel request failed to stop query at vnodes. 2021-04-01 13:38:42 +08:00
Shengliang Guan 594ba93358
Merge pull request #5635 from taosdata/fix/TD-3314
[TD-3314]<fix>: new staging directory for deleting vnodes
2021-04-01 13:31:43 +08:00
Haojun Liao 6cef55cc5e [td-225]fix bug found in regression test. 2021-04-01 10:23:21 +08:00
Haojun Liao 5fe628298a [td-225]refactor. 2021-04-01 09:47:07 +08:00
Shengliang Guan 24f134f421
Merge pull request #5639 from taosdata/feature/linux
remove  FResetVersion function
2021-04-01 09:22:35 +08:00
yihaoDeng 63f9bb45dc change default timeout 2021-04-01 06:23:36 +08:00
yihaoDeng c001a86a08 change log 2021-04-01 05:32:09 +08:00
yihaoDeng 524b708079 add connection timeout 2021-04-01 02:06:48 +08:00
Shuduo Sang 6cb5af8072
Hotfix/sangshuduo/td 3607 taosdemo buffer overflow (#5636)
* [TD-3607] <fix>: fix taosdemo buffer overflow.

* [TD-3607] <fix>: taosdemo buffer overflow.

add tmp buffer.

* [TD-3607] <fix>: taosdemo buffer overflow.

fix data generation.

* [TD-3607] <fix>: taosdemo buffer overflow.

fix normal table writting.

* [TD-3607] <fix>: taosdemo buffer overflow.

remove tail spaces.

* [TD-3607] <fix>: taosdemo buffer overflow.

fix taosdemo alter table test case.

* [TD-3607] <fix>: taosdemo buffer overflow.

fix taosdemo alter table case.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-31 21:40:40 +08:00
Haojun Liao aaacedf7bd [td-3621] 2021-03-31 21:18:05 +08:00
Haojun Liao fcf35bd7d2 [td-3571] <fix>: fix null value filter bug for bool type. 2021-03-31 21:12:41 +08:00
Haojun Liao 6530308140 Merge branch 'develop' into feature/qrefactor 2021-03-31 20:28:48 +08:00
haojun Liao ff2f32ad9f
Merge pull request #5626 from taosdata/hotfix/TD-3605
[TD-3605]fix CQ memleak issue
2021-03-31 19:56:14 +08:00
slguan 0bbfc5a532 Bxiao request changed from 100 to 1000 2021-03-31 18:32:56 +08:00
slguan 536a9e9f3f remove FResetVersion function 2021-03-31 16:55:31 +08:00
Minglei Jin d2a0fc5b93 [TD-3314]<fix>: new staging directory for deleting vnodes 2021-03-31 11:34:18 +08:00
Shuduo Sang c26d882057
[TD-3284] <fix>: taosdemo support fixed value tag. (#5632)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-31 11:17:51 +08:00
dapan1121 22d1853903 fix mem leak issue 2021-03-31 10:52:13 +08:00
huili 9cb2020933
Merge pull request #5625 from taosdata/hotfix/checktsdbfheader
update file header on start
2021-03-31 09:46:52 +08:00
huili c590a2dd47
Merge pull request #5629 from taosdata/hotfix/TD-3601
[TD-3601]<hotfix>: fix early 1970 time problem
2021-03-31 09:46:36 +08:00
dapan1121 a5b4ae6945 support child table having query 2021-03-30 19:39:48 +08:00
dapan1121 75faa804df restart travis 2021-03-30 19:14:25 +08:00
Hongze Cheng e2e88b2e95 [TD-3601]<hotfix>: fix early 1970 time problem 2021-03-30 18:05:29 +08:00
Haojun Liao b606b97510 [td-225]fix a invalid read. 2021-03-30 16:40:27 +08:00
Hongze Cheng f447556178 fix more 2021-03-30 16:01:33 +08:00
dapan1121 5e82ec5988 fix memleak issue 2021-03-30 15:58:14 +08:00
Hui Li 9353aed068 [TD-3604]<fix>subscribe hanlder overwrite 2021-03-30 15:57:14 +08:00
Hongze Cheng 189058e7df update file header on start 2021-03-30 14:32:14 +08:00
Shuduo Sang 77e3675640
[TD-3598] <fix>: cleanup few code lines. (#5622)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-30 12:51:02 +08:00
Shengliang Guan 773802c91b
Merge pull request #5616 from taosdata/fix/TD-3592
[TD-3592]<fix>: fix dnode ID syntax in drop dnode <dnode_id>
2021-03-30 12:38:08 +08:00
Shengliang Guan 0e5b5a3142
Merge pull request #5606 from taosdata/hotfix/TD-3574
Hotfix/td 3574
2021-03-30 12:37:08 +08:00
Shuduo Sang c13f335fcf
[TD-3591] <fix>: rework limit and offset logic. (#5618)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-30 00:35:34 +08:00
Shuduo Sang 78e67ebe7c
[TD-3589] <fix>: taosdemo need to use db before query. (#5612)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-30 00:35:01 +08:00
Shengliang Guan 0610e32a73 Merge branch 'develop' into hotfix/TD-3574 2021-03-29 10:01:01 +00:00
dapan1121 22882196c3 fix bug 2021-03-29 17:36:57 +08:00
Shuduo Sang fa6c851cea
[TD-3577] <fix>: taosdemo print stb insert interval. (#5610)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-29 17:31:27 +08:00
Minglei Jin 1ef3c55242 [TD-3592]<fix>: fix dnode ID syntax in drop dnode <dnode_id> 2021-03-29 17:03:40 +08:00
dapan1121 59233ea596 fix bug 2021-03-29 16:17:04 +08:00
Shuduo Sang 5e7a7d31cf
[TD-3576] <fix>: taosdemo print query times. (#5609)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-29 16:09:42 +08:00
zyyang d2ec29715a
[TD-3410]<feature>: support nutz framework (#5600)
* [TD-3410]feature: adapted to nutz

* change

* change

* change

* change

* [TD-3447]<feature>: JDBC-RESTful and JDBC-JNI support setObject

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* [TD-3548]<feature>: support ParameterMetaData in JDBC-RESTful and JDBC-JNI

* change

* change

* [TD-3446]<feature>: JDBC-JNI and JDBC-RESTful do not need invoke Class.forName any more

* change jdbc version

* change

* change

* change
2021-03-29 14:42:49 +08:00
Shuduo Sang 92179b8108
Hotfix/sangshuduo/td 3575 support stb query times (#5605)
* [TD-3575] <fix>: support query times in specified and super query.

refactor code.

* [TD-3575] <fix>: support query times in specified and super query.

refactor code 2.

* [TD-3575] <fix>: support query times in specified and super query.

refactor code 3.

* [TD-3575] <fix>: support query times in specified and super query.

add query times parse in sub sections.

* [TD-3575] <fix>: support query times in specified and super query.

replace query times with specified query or super query.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-29 13:55:40 +08:00
Shengliang Guan f73f8a56c0
Merge pull request #5584 from taosdata/fix/TD-3185
[TD-3185]<fix>: default numOfCommitThreads to 4, show in cfg template
2021-03-29 11:16:28 +08:00
Shengliang Guan 4b69ffbfdb [TD-3574]<fix>: Drop database operation is not completed when restarting, may cause taosd crash 2021-03-29 03:02:38 +00:00
huili e0d6fe731b
Merge pull request #5588 from taosdata/hotfix/TD-3534
[TD-3534]<hotfix>: fix TD-3534
2021-03-29 10:00:00 +08:00
Shuduo Sang 41741a599f
Hotfix/sangshuduo/td 3197 fix taosdemo coverity scan (#5602)
* [TD-3197] <fix>: fix taosdemo coverity scan issues.

* [TD-3197] <fix>: fix taosdemo coverity scan issue.

fix subscribeTest pids uninitialized.

* [TD-3197] <fix>: fix taosdemo coverity scan issues.

* [TD-3197] <fix>: fix coverity scan issues.

check super tbl info pointer.

* [TD-3197] <fix>: fix coverity scan issues.

move sub tbl query thread join into loop

* [TD-3197] <fix>: fix coverity scan issues.

remove unused variable

* [TD-3197] <fix>: fix coverity scan issues.

use more secure random library

* [TD-3197] <fix>: fix coverity scan issues.

use strncpy for more safe

* [TD-3197] <fix>: fix taosdemo coverity scan issue.

replace arc4random with rand().

* [TD-3197] <fix>: fix coverity scan issues.

check stb info pointer for start time

* [TD-3197] <fix>: fix coverity scan issues.

fix strcpy vulnerability

* [TD-3197] <fix>: fix taosdemo coverity scan issue.

modify taosdemoTest2. try to check database continously.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-28 20:23:11 +08:00
Shuduo Sang f69557fb6c
[TD-3544] <fix>: move query times detect to query meta file parse. (#5597)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-27 19:57:12 +08:00
Shuduo Sang 868ee10750
[TD-3546] <fix>: fix taosdemo quer crash as index variable mistake. (#5598)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-27 19:56:45 +08:00
Shuduo Sang 2c4bcbe306
Feature/sangshuduo/td 3317 taosdemo interlace (#5596)
* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

check offset 0.

* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

fix sample file import bug.

* [TD-3316] <fix>: add test case for limit and offset. fix sample data issue.

* [TD-3327] <fix>: fix taosdemo segfault when import data from sample data file.

* [TD-3317] <feature>: make taosdemo support interlace mode.

json parameter rows_per_tbl support.

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode insertion.

refactor.

* [TD-3317] <feature>: support interlace mode insertion.

change json file.

* [TD-3317] <feature>: support interlace mode insertion.

fix multithread create table regression.

* [TD-3317] <feature>: support interlace mode insertion.

working but not perfect.

* [TD-3317] <feature>: support interlace mode insertion.

rename lowaTest with taosdemoTestWithJson

* [TD-3317] <feature>: support interlace mode insertion.

perfect

* [TD-3317] <feature>: support interlace mode insertion.

cleanup.

* [TD-3317] <feature>: support interlace mode insertion.

adjust algorithm of loop times.

* [TD-3317] <feature>: support interlace mode insertion.

fix delay time bug.

* [TD-3317] <feature>: support interlace mode insertion.

fix progressive timestamp bug.

* [TD-3317] <feature>: support interlace mode insertion.

add an option for performance print.

* [TD-3317] <feature>: support interlace mode insertion.

change json test case with less table for acceleration.

* [TD-3317] <feature>: support interlace mode insertion.

change progressive mode timestamp step and testcase.

* [TD-3197] <fix>: fix taosdemo coverity scan issues.

* [TD-3197] <fix>: fix taosdemo coverity scan issue.

fix subscribeTest pids uninitialized.

* [TD-3317] <feature>: support interlace mode insertion.

add time shift for no sleep time.

* [TD-3317] <feature>: support interlace insert.

rework timestamp.

* [TD-3317] <feature>: support interlace mode insertion.

change rows_per_tbl to interlace_rows.

* [TD-3317] <feature>: taosdemo suppoert interlace mode.

remove trailing spaces.

* [TD-3317] <feature>: taosdemo support interlace insertion.

prompt if interlace > num_of_records_per_req

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-27 13:30:14 +08:00
Shuduo Sang 4acaa5dfc0
Feature/sangshuduo/td 3317 taosdemo interlace (#5593)
* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

check offset 0.

* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

fix sample file import bug.

* [TD-3316] <fix>: add test case for limit and offset. fix sample data issue.

* [TD-3327] <fix>: fix taosdemo segfault when import data from sample data file.

* [TD-3317] <feature>: make taosdemo support interlace mode.

json parameter rows_per_tbl support.

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode insertion.

refactor.

* [TD-3317] <feature>: support interlace mode insertion.

change json file.

* [TD-3317] <feature>: support interlace mode insertion.

fix multithread create table regression.

* [TD-3317] <feature>: support interlace mode insertion.

working but not perfect.

* [TD-3317] <feature>: support interlace mode insertion.

rename lowaTest with taosdemoTestWithJson

* [TD-3317] <feature>: support interlace mode insertion.

perfect

* [TD-3317] <feature>: support interlace mode insertion.

cleanup.

* [TD-3317] <feature>: support interlace mode insertion.

adjust algorithm of loop times.

* [TD-3317] <feature>: support interlace mode insertion.

fix delay time bug.

* [TD-3317] <feature>: support interlace mode insertion.

fix progressive timestamp bug.

* [TD-3317] <feature>: support interlace mode insertion.

add an option for performance print.

* [TD-3317] <feature>: support interlace mode insertion.

change json test case with less table for acceleration.

* [TD-3317] <feature>: support interlace mode insertion.

change progressive mode timestamp step and testcase.

* [TD-3197] <fix>: fix taosdemo coverity scan issues.

* [TD-3197] <fix>: fix taosdemo coverity scan issue.

fix subscribeTest pids uninitialized.

* [TD-3317] <feature>: support interlace mode insertion.

add time shift for no sleep time.

* [TD-3317] <feature>: support interlace insert.

rework timestamp.

* [TD-3317] <feature>: support interlace mode insertion.

change rows_per_tbl to interlace_rows.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-26 20:46:54 +08:00
dapan1121 2eb7174f76 refact code 2021-03-26 19:29:42 +08:00
Shuduo Sang c89ada70fd
[TD-3524] <fix>: taosdemo query multithreading workaround. (#5587)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-26 19:29:17 +08:00
haojun Liao ccbb062cec
Merge pull request #5571 from taosdata/feature/TD-3036
[TD-3036]<feature>: syncdb <db_name> replica;
2021-03-26 18:58:48 +08:00
dapan1121 1f02bee6cb Merge branch 'develop' into feature/TD-2577 2021-03-26 17:31:39 +08:00
Hongze Cheng 5bfda528e8 [TD-3534]<hotfix>: fix TD-3534 2021-03-26 17:00:57 +08:00
haojun Liao 119fcee909
Merge pull request #5570 from taosdata/feature/qrefactor
[td-225] update log.
2021-03-26 16:23:47 +08:00
Minglei Jin 6e5a3fe4ad [TD-3185]<fix>: default numOfCommitThreads to 4, show in cfg template 2021-03-26 15:06:06 +08:00
Shuduo Sang 211d323a4a
Feature/sangshuduo/td 3402 taosdemo version (#5582)
* [TD-3402] <feature>: taosdemo version.

feature completed.

* [TD-3402] <feature>: taosdemo support version.

fix path issue for TDinternal.

* [TD-3402] <feature>: taosdemo support version.

fix VERNUMBER for TDinternal.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-26 13:33:27 +08:00
Shengliang Guan c6203a1821
Merge pull request #5562 from taosdata/release/s117_2
Release/s117 2
2021-03-26 13:14:09 +08:00
Shuduo Sang e9e5acd696
Hotfix/sangshuduo/td 3400 max query sql count 100 (#5564)
* [TD-3400] <fix>: increase MAX_QUERY_SQL_COUNT to 100.

* [TD-3400] <fix>: increase MAX_QUERY_SQL_COUNT to 100.

use query times too instead of infinite loop.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-26 09:44:40 +08:00
Shuduo Sang 162e84dcf0
Hotfix/sangshuduo/td 3321 better stb describe2 (#5578)
* [TD-3321] <fix>: describe stb with better logic.

* [TD-3321] <fix>: describe stb with better logic.

* [TD-3321] <fix>: describe stb with better logic.

describe stb to check if exists.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-26 07:43:05 +08:00
Shuduo Sang e9b3f5d35b
[TD-3478] <fix>: increase thread num of table creation same as insert… (#5577)
* [TD-3478] <fix>: increase thread num of table creation same as insertion.

* [TD-3478] <fix>: increase thread num of table creation same as insertion.

fix potential refer to derefed buffer.

* [TD-3478] <fix>: increase thread num of table creation same as insertion.

change rowsPerTbl to interlaceRows

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-25 21:35:13 +08:00
Shuduo Sang 1b998f06a4
[TD-3472] <fix>: fix query times determination miss. (#5576)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-25 21:00:52 +08:00
Shuduo Sang 5e77d162aa
[TD-3402] <feature>: taosdemo version. (#5574)
feature completed.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-25 19:02:50 +08:00
Haojun Liao 6fc5e7139d [td-225] fix errors found in regression test. 2021-03-25 17:05:15 +08:00
haojun Liao f36211888b
Merge pull request #5563 from taosdata/origin/hotfix/TD-3409
TD-3409
2021-03-25 16:52:57 +08:00
haojun Liao aa721fff08
Merge pull request #5568 from taosdata/hotfix/TD-3465
[TD-3465]<hotfix>: fix TD-3465
2021-03-25 16:52:18 +08:00
Shengliang Guan b643554338
Merge pull request #5556 from taosdata/fix/TD-3349
[TD-3349]<fix>: maxSQLLength <- TSDB_MAX_ALLOWED_SQL_LEN; minTablesPe…
2021-03-25 16:32:04 +08:00
Minglei Jin 4af02b7828 [TD-3036]<feature>: syncdb <db_name> replica;
resync slave vnodes to keep consistent with master vnodes.
2021-03-25 16:06:25 +08:00
Haojun Liao 58458070f2 [td-225] update log. 2021-03-25 15:54:22 +08:00
haojun Liao 8512726778
Merge pull request #5553 from taosdata/hotfix/TD-3448
[TD-3448]Fix cq get empty vgroup and crash issue
2021-03-25 15:52:27 +08:00
haojun Liao 911d680975
Merge pull request #5561 from taosdata/hotfix/TD-3462
[TD-3462]fix no acctId when connection fail issue
2021-03-25 15:52:09 +08:00
haojun Liao 36ed687b33
Merge pull request #5533 from taosdata/feature/TD-3295
[TD-3295]support multiple tables join
2021-03-25 15:51:39 +08:00
Hongze Cheng d24e31810d refact 2021-03-25 14:48:44 +08:00
Hongze Cheng bd0127a566 [TD-3465]<hotfix>: fix TD-3465 2021-03-25 14:45:17 +08:00
Shengliang Guan 0bc85e1655 fix conflicts 2021-03-25 03:33:23 +00:00
Shengliang Guan c98285e05c fix conflicts 2021-03-25 02:59:50 +00:00
Shengliang Guan ea3cde9136 add shell tools 2021-03-25 02:40:08 +00:00
dapan1121 82ee4c341f no acctId when connection fail issue 2021-03-25 09:50:36 +08:00
yihaoDeng 0247805418 TD-3409 2021-03-25 04:09:12 +08:00
Shuduo Sang afd0869a7c
[TD-3321] <fix>: describe stb with better logic. (#5559)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-24 20:04:31 +08:00
Shuduo Sang 6e3322d35d
Feature/sangshuduo/td 3434 taosdemo support query times (#5541)
* [TD-3434] <feature>: taosdemo support query times

first commit.

* [TD-3434] <feature>: taosdemo support query times.

refine interlace test case.

* [TD-3434] <feature>: taosdemo support query times.

change cmdline parameters according to TD-3431.

* [TD-3434] <feature>: taosdemo support query times.

fix typo in fulltest.sh

* [TD-3434] <feature>: taosdemo support query times.

add 2 sec sleep to avoid segfault.

* [TD-3434] <feature>: taosdemo support query times.

make query test easier to pass.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-24 16:58:09 +08:00
Shengliang Guan 51d5b56089
Merge pull request #5535 from taosdata/feature/linux
TD-3246
2021-03-24 15:51:53 +08:00
Minglei Jin 7b82e646c0 [TD-3349]<fix>: maxSQLLength <- TSDB_MAX_ALLOWED_SQL_LEN; minTablesPerVnode, tableIncStepPerVnode <- 100 2021-03-24 14:46:38 +08:00
dapan1121 a0d1e81027 fix bug 2021-03-24 13:24:05 +08:00
dapan1121 3ad4453196 fix bug 2021-03-24 13:22:22 +08:00
dapan1121 f9da62de46 Merge branch 'hotfix/TD-3448' into release/s118 2021-03-24 11:46:26 +08:00
dapan1121 4f01d746e2 cq get empty vgroup and crash issue 2021-03-24 11:40:55 +08:00
Shuduo Sang b7ec3a3c70
[TD-3357] <fix>: fix child table count if exists. (#5542)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-24 11:08:20 +08:00
haojun Liao 82a947a337
Merge pull request #5550 from taosdata/feature/qrefactor
Feature/qrefactor
2021-03-24 11:01:36 +08:00
Shuduo Sang 49b674c3d2
[TD-3433] <fix>: fix child table count issue. (#5552)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-24 10:37:30 +08:00
Shengliang Guan 519b93310c Merge remote-tracking branch 'origin/develop' into feature/linux 2021-03-23 10:18:46 +00:00
Haojun Liao 076d54a9ac [td-225]fix compiler error. 2021-03-23 17:17:12 +08:00
Haojun Liao 74148ee3de [td-3036]<feature>: support the db sync operator. 2021-03-23 16:44:20 +08:00
dapan1121 4e5733c0ac support multiple tables join 2021-03-23 15:48:57 +08:00
Shuduo Sang 94bb5fe80d
[TD-3407] <fix>: print more info to result file. (#5538)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-23 15:28:25 +08:00
Shuduo Sang 3b97bd716d
Feature/sangshuduo/td 3317 taosdemo interlace (#5537)
* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

check offset 0.

* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

fix sample file import bug.

* [TD-3316] <fix>: add test case for limit and offset. fix sample data issue.

* [TD-3327] <fix>: fix taosdemo segfault when import data from sample data file.

* [TD-3317] <feature>: make taosdemo support interlace mode.

json parameter rows_per_tbl support.

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode insertion.

refactor.

* [TD-3317] <feature>: support interlace mode insertion.

change json file.

* [TD-3317] <feature>: support interlace mode insertion.

fix multithread create table regression.

* [TD-3317] <feature>: support interlace mode insertion.

working but not perfect.

* [TD-3317] <feature>: support interlace mode insertion.

rename lowaTest with taosdemoTestWithJson

* [TD-3317] <feature>: support interlace mode insertion.

perfect

* [TD-3317] <feature>: support interlace mode insertion.

cleanup.

* [TD-3317] <feature>: support interlace mode insertion.

adjust algorithm of loop times.

* [TD-3317] <feature>: support interlace mode insertion.

fix delay time bug.

* [TD-3317] <feature>: support interlace mode insertion.

fix progressive timestamp bug.

* [TD-3317] <feature>: support interlace mode insertion.

add an option for performance print.

* [TD-3317] <feature>: support interlace mode insertion.

change json test case with less table for acceleration.

* [TD-3317] <feature>: support interlace mode insertion.

change progressive mode timestamp step and testcase.

* [TD-3197] <fix>: fix taosdemo coverity scan issues.

* [TD-3197] <fix>: fix taosdemo coverity scan issue.

fix subscribeTest pids uninitialized.

* [TD-3317] <feature>: support interlace mode insertion.

add time shift for no sleep time.

* [TD-3317] <feature>: support interlace insert.

rework timestamp.

* [TD-3317] <feature>: support interlace mode insertion.

change rows_per_tbl to interlace_rows.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-23 15:14:50 +08:00
Haojun Liao bfe554a0d6 [td-3391]<fix>: fix invalid error msg. 2021-03-23 14:54:41 +08:00
Shuduo Sang dfdeb7e0cc
[TD-3431] <fix>: fix taosdemo cmdline incorrect arguments. (#5536)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-23 11:15:11 +08:00
dapan1121 a8a7c7db67 fix double free error 2021-03-23 11:07:01 +08:00
slguan a9bd35cba6 fix compile errors 2021-03-22 19:43:54 +08:00
dapan1121 ff4328c319 fix error 2021-03-22 19:29:12 +08:00
Shengliang Guan 3f726464ea TD-3246 2021-03-22 11:21:53 +00:00
dapan1121 54d94e1a96 fix compile err 2021-03-22 18:58:05 +08:00
Shengliang Guan 38a8cb7aee
Merge pull request #5520 from taosdata/hotfix/TD-3298
[TD-3298]<hotfix>: fix coverity scan error
2021-03-22 18:45:06 +08:00
Shuduo Sang 835886d11e
Hotfix/sangshuduo/td 3393 taosdemo timestamp rework (#5531)
* [TD-3393] <fix>: taosdemo timestamp rework.

change default timestamp step to 1ms.

* [TD-3393] <fix>: taosdemo timestamp rework.

adjust shift timestamp logic to table sequence turn to start.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-22 18:44:06 +08:00
dapan1121 ff41983d02 fix windows compile err 2021-03-22 18:42:39 +08:00
dapan1121 139ed7dea1 add test case 2021-03-22 17:35:10 +08:00
Shuduo Sang 82ad11630d
Feature/sangshuduo/td 3416 taosdemo interlace testcase (#5524)
* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

check offset 0.

* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

fix sample file import bug.

* [TD-3316] <fix>: add test case for limit and offset. fix sample data issue.

* [TD-3327] <fix>: fix taosdemo segfault when import data from sample data file.

* [TD-3317] <feature>: make taosdemo support interlace mode.

json parameter rows_per_tbl support.

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode insertion.

refactor.

* [TD-3317] <feature>: support interlace mode insertion.

change json file.

* [TD-3317] <feature>: support interlace mode insertion.

fix multithread create table regression.

* [TD-3317] <feature>: support interlace mode insertion.

working but not perfect.

* [TD-3317] <feature>: support interlace mode insertion.

rename lowaTest with taosdemoTestWithJson

* [TD-3317] <feature>: support interlace mode insertion.

perfect

* [TD-3317] <feature>: support interlace mode insertion.

cleanup.

* [TD-3317] <feature>: support interlace mode insertion.

adjust algorithm of loop times.

* [TD-3317] <feature>: support interlace mode insertion.

fix delay time bug.

* [TD-3317] <feature>: support interlace mode insertion.

fix progressive timestamp bug.

* [TD-3317] <feature>: support interlace mode insertion.

add an option for performance print.

* [TD-3317] <feature>: support interlace mode insertion.

change json test case with less table for acceleration.

* [TD-3317] <feature>: support interlace mode insertion.

change progressive mode timestamp step and testcase.

* [TD-3197] <fix>: fix taosdemo coverity scan issues.

* [TD-3197] <fix>: fix taosdemo coverity scan issue.

fix subscribeTest pids uninitialized.

* [TD-3317] <feature>: support interlace mode insertion.

add time shift for no sleep time.

* [TD-3317] <feature>: support interlace insert.

rework timestamp.

* [TD-3416] <feature>: add taosdemo interlace testcase.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-22 15:44:06 +08:00
Shuduo Sang de97080d85
Hotfix/sangshuduo/td 3197 fix taosdemo coverity scan (#5521)
* [TD-3197] <fix>: fix taosdemo coverity scan issues.

* [TD-3197] <fix>: fix taosdemo coverity scan issue.

fix subscribeTest pids uninitialized.

* [TD-3197] <fix>: fix taosdemo coverity scan issues.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-22 14:36:30 +08:00
Shengliang Guan e600ffa154
Merge pull request #5519 from taosdata/release/s118
Release/s118
2021-03-22 10:30:28 +08:00
Hongze Cheng e11f0585ef [TD-3298]<hotfix>: fix coverity scan error 2021-03-22 10:00:55 +08:00
dapan1121 e60179df4b Merge branch 'develop' into feature/TD-3295 2021-03-22 09:11:51 +08:00
Shuduo Sang bf684ed118 cast to long in taodemo.c 2021-03-21 18:42:15 +00:00
Shengliang Guan 4ee65dcd0e Merge branch 'hotfix/TD-3310' into feature/linux 2021-03-20 20:59:56 +08:00
Shengliang Guan 89b913c2bc TD-3310 2021-03-20 19:16:12 +08:00
Shengliang Guan 69dfd40a3b Merge remote-tracking branch 'origin/develop' into feature/linux 2021-03-20 18:50:42 +08:00
Shuduo Sang 30b2611257
Feature/sangshuduo/td 3317 taosdemo interlace (#5515)
* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

check offset 0.

* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

fix sample file import bug.

* [TD-3316] <fix>: add test case for limit and offset. fix sample data issue.

* [TD-3327] <fix>: fix taosdemo segfault when import data from sample data file.

* [TD-3317] <feature>: make taosdemo support interlace mode.

json parameter rows_per_tbl support.

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode insertion.

refactor.

* [TD-3317] <feature>: support interlace mode insertion.

change json file.

* [TD-3317] <feature>: support interlace mode insertion.

fix multithread create table regression.

* [TD-3317] <feature>: support interlace mode insertion.

working but not perfect.

* [TD-3317] <feature>: support interlace mode insertion.

rename lowaTest with taosdemoTestWithJson

* [TD-3317] <feature>: support interlace mode insertion.

perfect

* [TD-3317] <feature>: support interlace mode insertion.

cleanup.

* [TD-3317] <feature>: support interlace mode insertion.

adjust algorithm of loop times.

* [TD-3317] <feature>: support interlace mode insertion.

fix delay time bug.

* [TD-3317] <feature>: support interlace mode insertion.

fix progressive timestamp bug.

* [TD-3317] <feature>: support interlace mode insertion.

add an option for performance print.

* [TD-3317] <feature>: support interlace mode insertion.

change json test case with less table for acceleration.

* [TD-3317] <feature>: support interlace mode insertion.

change progressive mode timestamp step and testcase.

* [TD-3197] <fix>: fix taosdemo coverity scan issues.

* [TD-3197] <fix>: fix taosdemo coverity scan issue.

fix subscribeTest pids uninitialized.

* [TD-3317] <feature>: support interlace mode insertion.

add time shift for no sleep time.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-20 09:21:05 +08:00
dapan1121 7d246d656e fix bug 2021-03-19 19:47:33 +08:00
haojun Liao e555bb974c
Merge pull request #5510 from taosdata/hotfix/TD-3375
[TD-3375]wrong table id issue
2021-03-19 18:18:08 +08:00
Shengliang Guan e3b4ceab88 Merge remote-tracking branch 'freemine/odbc2' into feature/linux 2021-03-19 10:15:06 +00:00
Shengliang Guan c5ff2275e9
Merge pull request #5511 from taosdata/feature/linux
change queued msg from 10k to 100k
2021-03-19 18:00:37 +08:00
Shuduo Sang b294d3ebaa
Feature/sangshuduo/td 3317 taosdemo interlace (#5500)
* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

check offset 0.

* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

fix sample file import bug.

* [TD-3316] <fix>: add test case for limit and offset. fix sample data issue.

* [TD-3327] <fix>: fix taosdemo segfault when import data from sample data file.

* [TD-3317] <feature>: make taosdemo support interlace mode.

json parameter rows_per_tbl support.

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode insertion.

refactor.

* [TD-3317] <feature>: support interlace mode insertion.

change json file.

* [TD-3317] <feature>: support interlace mode insertion.

fix multithread create table regression.

* [TD-3317] <feature>: support interlace mode insertion.

working but not perfect.

* [TD-3317] <feature>: support interlace mode insertion.

rename lowaTest with taosdemoTestWithJson

* [TD-3317] <feature>: support interlace mode insertion.

perfect

* [TD-3317] <feature>: support interlace mode insertion.

cleanup.

* [TD-3317] <feature>: support interlace mode insertion.

adjust algorithm of loop times.

* [TD-3317] <feature>: support interlace mode insertion.

fix delay time bug.

* [TD-3317] <feature>: support interlace mode insertion.

fix progressive timestamp bug.

* [TD-3317] <feature>: support interlace mode insertion.

add an option for performance print.

* [TD-3317] <feature>: support interlace mode insertion.

change json test case with less table for acceleration.

* [TD-3317] <feature>: support interlace mode insertion.

change progressive mode timestamp step and testcase.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-19 17:43:18 +08:00
haojun Liao 8805404cd5
Merge pull request #5504 from taosdata/hotfix/TD-3351
[TD-3351]fix fid error when ts < 0
2021-03-19 17:39:26 +08:00
freemine ef67b46901 link taos_static for tcodbc 2021-03-19 16:59:25 +08:00
Shengliang Guan 6143a169f7 change queued msg from 10k to 100k 2021-03-19 08:22:59 +00:00
dapan1121 485ec16ca4 wrong table id issue 2021-03-19 16:14:14 +08:00
Shengliang Guan dd0f7be31d
Merge pull request #5502 from taosdata/fix/TD-3370
[TD-3370]<fix>: fix used disk size, show acctual used instead of non-…
2021-03-19 15:39:03 +08:00
freemine 79e7343495 Merge remote-tracking branch 'upstream/develop' into odbc2 2021-03-19 15:32:18 +08:00
dapan1121 a4eb005385 Merge branch 'develop' into feature/TD-3295 2021-03-19 14:43:00 +08:00
dapan1121 647a0e9919 fix bug 2021-03-19 14:37:25 +08:00
dapan1121 6eeebb0b2c fix fid error when ts < 0 2021-03-19 14:24:39 +08:00
Minglei Jin 20f2a7b71e [TD-3370]<fix>: fix used disk size, show acctual used instead of non-avail to current user 2021-03-19 13:54:27 +08:00
Shengliang Guan e9ea8814ec TD-3372 2021-03-19 05:30:31 +00:00
Shengliang Guan bd45b7a66d
Merge pull request #5498 from taosdata/feature/linux
Feature/linux
2021-03-19 13:27:55 +08:00
haojun Liao 7b1dbf2bc6
Merge pull request #5499 from taosdata/feature/query
[td-3361]<fix>: fix crash caused by nchar type filter.
2021-03-19 13:18:59 +08:00
Shuduo Sang d5bacb71c6
[TD-3369] <fix>: fix taosdemo invalid write valgrind reports. (#5496) 2021-03-19 11:51:13 +08:00
Haojun Liao 22698b8db0 [td-225]update the output column index. 2021-03-19 10:51:55 +08:00
freemine 64e3e94466 Merge remote-tracking branch 'upstream/develop' into odbc2 2021-03-19 10:49:27 +08:00
Haojun Liao 5586c23906 [td-3361]<fix>: fix crash caused by nchar type filter. 2021-03-19 10:07:27 +08:00
Shengliang Guan 8b4bb3fcc4 Merge remote-tracking branch 'origin/develop' into feature/linux 2021-03-19 02:00:06 +00:00
Shengliang Guan c65a1d939c Merge remote-tracking branch 'origin/release/s117_2' into feature/linux 2021-03-19 02:00:00 +00:00
Shengliang Guan 7916c1df3d
Merge pull request #5471 from taosdata/hotfix/TD-3320
[TD-3320]<hotfix>: fix sync coredump
2021-03-19 09:43:42 +08:00
Shengliang Guan bee74151bb fix compile error 2021-03-18 22:31:27 +08:00
Shengliang Guan cd12c76130
Merge pull request #5490 from taosdata/feature/win
TD-3367
2021-03-18 22:16:43 +08:00
Shuduo Sang d8f1b34f56
[TD-3356] <fix>: fix bug regarding limit offset with exist child table. (#5495)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-18 21:33:52 +08:00
Shengliang Guan af2f6bb02c
Merge pull request #5486 from taosdata/feature/linux
[TD-3355]<fix>: Fix invalid table id problem caused by idpool
2021-03-18 21:24:00 +08:00
dapan1121 c07d2ff9ee fix bug 2021-03-18 19:30:51 +08:00
Shuduo Sang 624a9191ce
[TD-3357] <fix>: fix child table count if exists. (#5488)
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-18 19:17:19 +08:00
Shengliang Guan f0a8c81f16
Merge pull request #5484 from taosdata/hotfix/TD-3353
[TD-3353]<hotfix>: solve race condition coredump
2021-03-18 18:07:34 +08:00
Shengliang Guan 9122ca3b1d TD-3367 2021-03-18 09:56:04 +00:00
Shuduo Sang 7610e8111d
Feature/sangshuduo/td 3317 taosdemo interlace (#5485)
* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

check offset 0.

* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

fix sample file import bug.

* [TD-3316] <fix>: add test case for limit and offset. fix sample data issue.

* [TD-3327] <fix>: fix taosdemo segfault when import data from sample data file.

* [TD-3317] <feature>: make taosdemo support interlace mode.

json parameter rows_per_tbl support.

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode insertion.

refactor.

* [TD-3317] <feature>: support interlace mode insertion.

change json file.

* [TD-3317] <feature>: support interlace mode insertion.

fix multithread create table regression.

* [TD-3317] <feature>: support interlace mode insertion.

working but not perfect.

* [TD-3317] <feature>: support interlace mode insertion.

rename lowaTest with taosdemoTestWithJson

* [TD-3317] <feature>: support interlace mode insertion.

perfect

* [TD-3317] <feature>: support interlace mode insertion.

cleanup.

* [TD-3317] <feature>: support interlace mode insertion.

adjust algorithm of loop times.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-18 17:43:09 +08:00
Shengliang Guan 681c314b44 TD-3355 2021-03-18 09:40:07 +00:00
haojun Liao 1835aaada8
Merge pull request #5483 from taosdata/feature/query
[td-3361]<fix>: nchar tag filter caused client crash.
2021-03-18 16:17:41 +08:00
Shengliang Guan fdc0febbe6 [TD-3355]<fix>: Fix invalid table id problem caused by idpool 2021-03-18 16:00:55 +08:00
Hongze Cheng e4e46768a6 [TD-3353]<hotfix>: solve race condition coredump 2021-03-18 15:50:55 +08:00
haojun Liao eb2eada0e2
Merge pull request #5474 from taosdata/hotfix/TD-3348
[TD-3348]sqlobj already released when async error returns
2021-03-18 15:28:18 +08:00
Haojun Liao 7447a8c562 [td-3361]<fix>: nchar tag filter caused client crash. 2021-03-18 15:24:36 +08:00
haojun Liao 6fa8a3c2da
Merge pull request #5461 from Wizzercn/develop
fix: jdbc connector RestfulResultSet.getString NPE
2021-03-18 11:04:15 +08:00
Shengliang Guan 1601a1e5cf
Merge pull request #5470 from taosdata/feature/linux
add some log for debug
2021-03-18 09:45:30 +08:00
Shuduo Sang 199e61ec54
Feature/sangshuduo/td 3317 taosdemo interlace (#5477)
* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

check offset 0.

* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

fix sample file import bug.

* [TD-3316] <fix>: add test case for limit and offset. fix sample data issue.

* [TD-3327] <fix>: fix taosdemo segfault when import data from sample data file.

* [TD-3317] <feature>: make taosdemo support interlace mode.

json parameter rows_per_tbl support.

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode insertion.

refactor.

* [TD-3317] <feature>: support interlace mode insertion.

change json file.

* [TD-3317] <feature>: support interlace mode insertion.

fix multithread create table regression.

* [TD-3317] <feature>: support interlace mode insertion.

working but not perfect.

* [TD-3317] <feature>: support interlace mode insertion.

rename lowaTest with taosdemoTestWithJson

* [TD-3317] <feature>: support interlace mode insertion.

perfect

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-18 09:41:26 +08:00
Shuduo Sang 3f312f8bf4
Feature/sangshuduo/td 3317 taosdemo interlace (#5476)
* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

check offset 0.

* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

fix sample file import bug.

* [TD-3316] <fix>: add test case for limit and offset. fix sample data issue.

* [TD-3327] <fix>: fix taosdemo segfault when import data from sample data file.

* [TD-3317] <feature>: make taosdemo support interlace mode.

json parameter rows_per_tbl support.

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode.

refactor

* [TD-3317] <feature>: support interlace mode insertion.

refactor.

* [TD-3317] <feature>: support interlace mode insertion.

change json file.

* [TD-3317] <feature>: support interlace mode insertion.

fix multithread create table regression.

* [TD-3317] <feature>: support interlace mode insertion.

working but not perfect.

* [TD-3317] <feature>: support interlace mode insertion.

rename lowaTest with taosdemoTestWithJson

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-17 23:15:18 +08:00
Shengliang Guan 000eac7421 TD-3354 2021-03-17 13:43:21 +00:00
dapan1121 624fb8b308 support multiple tables join 2021-03-17 19:47:29 +08:00
Shengliang Guan 5e94568d53
Merge pull request #5472 from taosdata/fix/TD-3337
[TD-3337]<fix>: [balance] fix pVgroup->pDb NULL pointer crash
2021-03-17 19:27:07 +08:00
Shengliang Guan 1af62a9dc0
Merge pull request #5468 from taosdata/fix/TD-3332
[TD-3332]<fix>: vnode report status if not closing instead of not ready
2021-03-17 19:26:53 +08:00
Shengliang Guan 1e3f28cfb3 hotfix for mxkz 2021-03-17 11:19:05 +00:00
dapan1121 363bacbe76 fix bug 2021-03-17 17:42:39 +08:00
haojun Liao 35f9dabb4a
Merge pull request #5466 from taosdata/feature/query
[td-225]remove unused keywords.
2021-03-17 16:28:16 +08:00
Minglei Jin 785645eef4 [TD-3337]<fix>: [balance] fix pVgroup->pDb NULL pointer crash 2021-03-17 16:26:37 +08:00
Hongze Cheng fcf6a1cf1f [TD-3320]<hotfix>: fix sync coredump 2021-03-17 16:08:55 +08:00
Shengliang Guan 34565eff16 add some log for debug 2021-03-17 07:47:51 +00:00
Minglei Jin be171d7787 [TD-3332]<fix>: vnode report status if not closing instead of not ready 2021-03-17 15:02:51 +08:00
Shengliang Guan 4d935a6837
Merge pull request #5463 from taosdata/feature/linux
TD-3323
2021-03-17 13:26:18 +08:00
Haojun Liao 8286820a1c [td-225]remove unused keywords. 2021-03-17 13:15:09 +08:00
haojun Liao 424e132308
Merge pull request #5464 from taosdata/feature/query
[td-3338]<fix>: query data before 1970-1-1 00:00:00 caused taosd crash.
2021-03-17 13:04:40 +08:00
haojun Liao cac833343c
Merge pull request #5426 from taosdata/hotfix/TD-3030
[TD-3030]two queries use one query info issue
2021-03-17 12:03:47 +08:00
Haojun Liao 583bbf26c5 [td-3338]<fix>: query data before 1970-1-1 00:00:00 caused taosd crash. 2021-03-17 12:02:01 +08:00
Shengliang Guan 9d024fe486 TD-3334 2021-03-17 10:34:13 +08:00
haojun Liao 57eb2da653
Merge pull request #5459 from taosdata/feature/query
Feature/query
2021-03-17 10:03:30 +08:00
Shengliang Guan 58cfd2ccf7 TD-3323 2021-03-17 01:16:04 +00:00
Shengliang Guan 8e525a3702
Merge pull request #5460 from taosdata/hotfix/sf
Hotfix/sf
2021-03-17 09:09:57 +08:00
Shuduo Sang 3cb51e980f
Hotfix/sangshuduo/td 3316 testcase for taosdemo limit offset (#5462)
* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

check offset 0.

* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

fix sample file import bug.
2021-03-17 00:10:45 +08:00
Shuduo Sang 8e455df297
Hotfix/sangshuduo/td 3327 taosdemo segfault sampledata (#5458)
* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

check offset 0.

* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

fix sample file import bug.

* [TD-3316] <fix>: add test case for limit and offset. fix sample data issue.

* [TD-3327] <fix>: fix taosdemo segfault when import data from sample data file.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-03-16 18:51:11 +08:00
Haojun Liao d422bba8dd [td-3318]<fix>: fix crash caused by empty stddev query. 2021-03-16 18:24:51 +08:00
slguan eb7a74d694 TD-3309 2021-03-16 18:05:07 +08:00
Wizzer 2307d8ef25 fix: jdbc connector RestfulResultSet.getString NPE 2021-03-16 17:57:04 +08:00
Haojun Liao 6396e651b9 [td-3183] <fix>: fix unsigned number arithmetic calculation with sort option caused crash. 2021-03-16 17:42:24 +08:00
Shengliang Guan 9f8f3c89f9 Merge remote-tracking branch 'origin/develop' into hotfix/sf 2021-03-16 09:23:44 +00:00
haojun Liao fcae1ef295
Merge pull request #5448 from taosdata/release/s117
Release/s117
2021-03-16 17:09:06 +08:00
Haojun Liao 71718ff3a6 Merge branch 'develop' into feature/query 2021-03-16 16:22:25 +08:00
haojun Liao 91b5af2cee
Merge pull request #5453 from taosdata/feature/qrefactor
[td-3313] <fix>: fix join bug
2021-03-16 16:20:07 +08:00
Haojun Liao 6cadb9dfa1 [td-3331]<fix>: print timestamp format error. 2021-03-16 16:17:42 +08:00
Haojun Liao c5d19cbf40 [td-3315]<fix>: enable insert timestamp in the format of string '1970-1-1 8:0:0' and other unix timestamp. 2021-03-16 15:03:33 +08:00
Minglei Jin d99b2bed1b http/string: append need one more byte for null 2021-03-16 14:24:31 +08:00
Haojun Liao befbdf8972 [td-225]update test. 2021-03-16 14:11:05 +08:00
Shengliang Guan e63be42434 Merge remote-tracking branch 'origin/fix/TD-3307' into hotfix/sf 2021-03-16 13:44:19 +08:00
zyyang ac5d5316ac
[TD-3082]<feature>: jdbc connector support unsigned tinyint, smallint, int, bigint (#5447)
* [TD-3082]<feature>: support unsigned number in JDBC connector

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change version

* change

* change
2021-03-16 13:44:09 +08:00
Shengliang Guan 7d232a7914 TD-3309 2021-03-16 05:19:14 +00:00
dapan1121 a4b97eec60 fix merge issue 2021-03-16 13:17:10 +08:00
Haojun Liao 1175e8343f [td-225] add more check. 2021-03-16 11:37:43 +08:00
Haojun Liao 01962da413 [td-225]fix error. 2021-03-16 11:26:29 +08:00
dapan1121 850fa1cda8 Merge branch 'develop' into hotfix/TD-3030 2021-03-16 11:15:12 +08:00
Haojun Liao 497a0e3b31 [td-2859]refactor. 2021-03-16 10:52:48 +08:00
Haojun Liao 18c0457af2 [td-225]fix null tag caused crash. 2021-03-16 10:19:00 +08:00
Haojun Liao daa7b47ee7 [td-3313] <fix>: fix join bug 2021-03-16 10:14:03 +08:00
Shengliang Guan 6c9f2db0c1 TD-3309 2021-03-16 01:39:17 +00:00
Shengliang Guan 2854d6105e TD-3308 2021-03-16 01:39:08 +00:00
Shuduo Sang bbfde59f0a
Hotfix/sangshuduo/td 3316 testcase for taosdemo limit offset (#5451)
* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

check offset 0.

* [TD-3316] <fix>: add testcase for taosdemo limit and offset.

fix sample file import bug.
2021-03-16 07:55:22 +08:00
haojun Liao a838ce83e8
Merge pull request #5440 from taosdata/feature/qrefactor
[td-3294]fix bug found by regression test.
2021-03-15 22:06:04 +08:00
Minglei Jin 4b55006194 Merge branch 'develop' into fix/TD-3307 2021-03-15 19:36:27 +08:00
Shengliang Guan 851975db4e TD-3308 2021-03-15 10:37:54 +00:00
Shengliang Guan c7e96a44f1
Merge branch 'develop' into release/s117 2021-03-15 18:35:28 +08:00
Shuduo Sang 86f4851520 [TD-3192] <feature>: support child table limit and offset.
resolve memory alloc issue.
2021-03-15 17:57:05 +08:00
Minglei Jin b434b54d77 [TD-3307]<fix>: fix too long string append with length >= 64 2021-03-15 16:54:10 +08:00
Haojun Liao 8ac63bb2cc [td-225]fix bugs found by regression test. 2021-03-15 15:48:48 +08:00
Shuduo Sang 86105e729a [TD-3192] <feature>: support childtable limit and offset.
make insert.json back to early version.
2021-03-15 14:18:03 +08:00
Haojun Liao 08aa04f174 [td-225]fix compiler error. 2021-03-15 13:18:15 +08:00