Commit Graph

5437 Commits

Author SHA1 Message Date
Hongze Cheng f2b434486d Merge branch 'develop' into feature/2.0tsdb 2020-06-24 08:05:54 +00:00
Shengliang Guan 47c15a9e6f [TD-437] fix crash while drop super table 2020-06-24 15:58:54 +08:00
Shengliang Guan 3fcb47fb5b Merge remote-tracking branch 'origin/develop' into hotfix/crash 2020-06-24 15:05:36 +08:00
Shengliang Guan e3f103423c
Merge pull request #2440 from taosdata/buildTaosdForJDBCTests
Build taosd before running jdbc tests
2020-06-24 15:03:01 +08:00
Hongze Cheng c14d5775e7 fix unlock repo meta bug 2020-06-24 06:46:55 +00:00
Shengliang Guan 1a8c806f55 Merge remote-tracking branch 'origin/develop' into hotfix/crash 2020-06-24 14:27:39 +08:00
Shengliang Guan 60989f618d scripts 2020-06-24 14:03:57 +08:00
Ping Xiao 0651c77810 TD-754: automatically build taosd before running jdbc tests 2020-06-24 13:55:15 +08:00
Hongze Cheng 03a8703bd8 Merge branch 'develop' into feature/2.0tsdb 2020-06-24 13:32:19 +08:00
Shengliang Guan 58189bd3ae
Merge pull request #2438 from taosdata/hotfix/test
Hotfix/test
2020-06-24 13:24:07 +08:00
Hongze Cheng db76012aa5 TD-611 2020-06-24 05:23:53 +00:00
Hui Li 2a5045cbb5 [add sim cases] 2020-06-24 11:39:47 +08:00
Hui Li 294ac7a0e4 [modify sim cases] 2020-06-24 11:37:25 +08:00
Shengliang Guan 9e47c5e8d4
Merge pull request #2437 from taosdata/feature/sangshuduo/multi-thread-random-test
Feature/sangshuduo/multi thread random test
2020-06-24 11:35:52 +08:00
Shuduo Sang 9c2880843f add alter_table to multi-thread version. 2020-06-24 11:31:31 +08:00
Shuduo Sang 5bbe0dc0d9 Merge branch 'feature/sangshuduo/multi-thread-random-test' of https://github.com/taosdata/TDengine into feature/sangshuduo/multi-thread-random-test 2020-06-24 11:30:08 +08:00
Shuduo Sang e4f20713c0 support alter table in random-test. 2020-06-24 10:09:17 +08:00
Shuduo Sang 2591b98809 support queue in multi-thread version. 2020-06-24 10:09:17 +08:00
Shengliang Guan aee0e7fe41 Merge remote-tracking branch 'origin/develop' into hotfix/crash 2020-06-24 09:57:16 +08:00
Hui Li 2d7548fb9c modify sim case 2020-06-24 08:49:37 +08:00
Shengliang Guan d26d41e719
Merge pull request #2436 from taosdata/hotfix/crash
Hotfix/crash
2020-06-24 00:10:22 +08:00
Shengliang Guan 403d5b5b97
Merge pull request #2435 from taosdata/feature/query
Feature/query
2020-06-23 23:06:18 +08:00
haojun Liao 4e2badf055
Merge pull request #2429 from taosdata/hotfix/coverity_query
fix coverity issue
2020-06-23 22:57:58 +08:00
Haojun Liao 768d7206c0 [td-225] 2020-06-23 22:52:21 +08:00
Haojun Liao 404d21706d [td-225] fix error in join 2020-06-23 22:37:47 +08:00
Shengliang Guan c7a198208e
Merge pull request #2431 from taosdata/bugfix/td-735
fix td-735
2020-06-23 22:29:41 +08:00
Shengliang Guan c3671a595b
Merge pull request #2433 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-06-23 22:28:42 +08:00
Shengliang Guan bc65119128
Merge pull request #2434 from taosdata/hotfix/test
modify for coverity scan
2020-06-23 22:28:17 +08:00
Shengliang Guan 99f927920a Merge remote-tracking branch 'origin/hotfix/coverity_query' into hotfix/crash 2020-06-23 22:25:47 +08:00
Shengliang Guan a2d965ea12 Merge remote-tracking branch 'origin/bugfix/td-735' into hotfix/crash 2020-06-23 22:25:33 +08:00
Shengliang Guan 9677a1e86d Merge remote-tracking branch 'origin/feature/2.0tsdb' into hotfix/crash 2020-06-23 22:25:16 +08:00
Shengliang Guan a534f89ee7 Merge remote-tracking branch 'origin/hotfix/test' into hotfix/crash 2020-06-23 22:24:59 +08:00
Shengliang Guan c0643c94b7 [TD-705] invalid read while create table 2020-06-23 22:16:59 +08:00
Hui Li d4f2304f24 [add sim cases for cluster] 2020-06-23 18:41:56 +08:00
Hui Li 8dc3e25759 [add sim case for cluster] 2020-06-23 17:48:48 +08:00
Hui Li 5f49e3608b modify for coverity scan 2020-06-23 17:44:48 +08:00
Hongze Cheng 90f44e04e6 Merge branch 'develop' into feature/2.0tsdb 2020-06-23 17:32:15 +08:00
Hongze Cheng 38b8f4efca TD-611 2020-06-23 17:30:47 +08:00
Bomin Zhang 3ea021a625 fix td-735 2020-06-23 17:11:52 +08:00
Shengliang Guan 9a6dd6d497
Merge pull request #2430 from taosdata/feature/query
[td-225]
2020-06-23 16:56:43 +08:00
Haojun Liao 3159d0fb98 [td-225] 2020-06-23 16:34:00 +08:00
Shengliang Guan 6c94917d44 scripts 2020-06-23 16:33:51 +08:00
Shengliang Guan 2e12fbfa6e [TD-705] autoIndex 2020-06-23 16:20:23 +08:00
Shengliang Guan 2586095fd6 [TD-705] remove table lock in sdb 2020-06-23 16:04:29 +08:00
Shengliang Guan 893c44d639
Merge pull request #2428 from taosdata/hotfix/sangshuduo/fix-c-demo-bug
fix c demo bugs.
2020-06-23 15:45:05 +08:00
Hongze Cheng dd31a82c1a adjust data 2020-06-23 15:44:40 +08:00
Shengliang Guan 17995563b4
Merge pull request #2427 from taosdata/hotfix/test
[modify for coverity scan]
2020-06-23 15:44:34 +08:00
Shengliang Guan b51812074b
Merge pull request #2426 from taosdata/regressionupdate
update regression tests
2020-06-23 15:43:58 +08:00
Hongze Cheng bc533f5aa7 Merge branch 'develop' into feature/2.0tsdb 2020-06-23 07:34:36 +00:00
Hongze Cheng ab64145d4b use unit test to test speed 2020-06-23 07:33:31 +00:00