xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
14,209 Commits 3 Branches 0 Tags 479 MiB
Commit Graph

14209 Commits

Author SHA1 Message Date
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
Elias Soong 6853c48474
Merge pull request #5589 from taosdata/zyyang-taosdata-patch-2 
Update docs.md
 2021-03-26 18:54:00 +08:00
dapan1121 1f02bee6cb Merge branch 'develop' into feature/TD-2577 2021-03-26 17:31:39 +08:00
zyyang 6ff7ca4e18
Update docs.md 
change jdbcType and SQLType
 2021-03-26 17:04:04 +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
wu champion 515397d447 Merge branch 'test/TD-3433' of https://github.com/taosdata/TDengine into test/TD-3433 2021-03-26 10:52:32 +08:00
wu champion c2da6d215a Merge branch 'develop' into test/TD-3433 2021-03-26 10:50:39 +08:00
wu champion 9db07982b2 fix 2021-03-26 10:50:14 +08:00
Elias Soong 89fa74aadc
Merge pull request #5581 from taosdata/docs/Update-Latest-Feature 
<docs>: update DataX document link.
 2021-03-26 10:37:58 +08:00
Elias Soong e15db08fe9 <docs>: update DataX document link. 2021-03-26 10:37:15 +08:00
huili f089bf0440
Merge pull request #5579 from taosdata/test/jenkins 
fix jenkins error
 2021-03-26 10:17:47 +08:00
liuyq-617 a504403cbc fix 2021-03-26 09:57:26 +08:00
liuyq-617 1cf439125c balance 2021-03-26 09:53:17 +08:00
liuyq-617 a89140cf0c fix 2021-03-26 09:48:27 +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
liuyq-617 82f21e7f10 fix 2021-03-26 09:44:24 +08:00
liuyq-617 68215323f5 fix jenkins error 2021-03-26 09:19:26 +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
Ping Xiao fd0a3a9603 change 2021-03-26 01:17:47 +08:00
Ping Xiao 1f08d25d63 Merge branch 'develop' into xiaoping/add_test_case 2021-03-26 01:11:36 +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
huili a4b3e5a78a
Merge pull request #5572 from taosdata/test/jenkins 
[TD-3443]<test>fix taosd deadlock in CI
 2021-03-25 19:34:00 +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
liuyq-617 d343bb022f fix 2021-03-25 17:41:23 +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
Ping Xiao 9887a58e74 [TD-1139]<test>: add c examples into CI 2021-03-25 16:46:56 +08:00
haojun Liao 8ffcf8af58
Merge pull request #5567 from taosdata/hotfix/TD-3464 
[TD-3464]fix asyncdemo crash issue
 2021-03-25 16:39:55 +08:00
Elias Soong 8b20e0199c
Merge pull request #5573 from taosdata/docs/Update-Latest-Feature 
[TD-2639] <docs>: add detail about firstEp.
 2021-03-25 16:35:31 +08:00
Elias Soong 371d786310 [TD-2639] <docs>: add detail about firstEp. 2021-03-25 16:34:58 +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
liuyq-617 c10285f1a0 [TD-3443]<test>fix taosd deadlock in CI 2021-03-25 16:16:50 +08:00
liuyq-617 093efa1117 fix taosd deadlock in CI 2021-03-25 16:13:21 +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
wu champion c7f4cd251d
Update bug3433.py 2021-03-25 15:09:25 +08:00
wu champion e113aa20ba add case for TD-3433 2021-03-25 14:58:18 +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
dapan1121 eafc5d39a5
Update asyncdemo.c 2021-03-25 14:34:50 +08:00
Ping Xiao 5a4ac21df7 fix crash issue 2021-03-25 14:31:10 +08:00