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

5365 Commits

Author SHA1 Message Date
Hongze Cheng f1ce022556 TD-353 2020-06-19 02:41:47 +00:00
Shengliang Guan c9860ac555
Merge pull request #2357 from taosdata/feature/query 
[td-225] add cancel query support, fix bugs in load file blocks when …
 2020-06-19 10:27:10 +08:00
Shengliang Guan 0101bc6ebe
Merge pull request #2355 from taosdata/hotfix/crash 
[TD-543] fix coverity scans
 2020-06-19 10:16:04 +08:00
Shengliang Guan fd54b879b8
Merge pull request #2352 from taosdata/dependabot/maven/tests/comparisonTest/opentsdb/opentsdbtest/com.fasterxml.jackson.core-jackson-databind-2.10.0.pr1 
Bump jackson-databind from 2.9.10.4 to 2.10.0.pr1 in /tests/comparisonTest/opentsdb/opentsdbtest
 2020-06-19 10:14:58 +08:00
Shengliang Guan 1b9ea9d07e [TD-543] fix coverity scans 2020-06-19 02:11:43 +00:00
Hongze Cheng b51aceefde TD-353 2020-06-19 02:03:32 +00:00
Hongze Cheng 53844d6b42 Merge branch 'develop' into feature/2.0tsdb 2020-06-19 01:51:45 +00:00
Hongze Cheng 7f9df4c361 TD-353 2020-06-19 01:41:14 +00:00
Shengliang Guan cfac1f8a85
Merge pull request #2353 from taosdata/hotfix/refCount 
reference count
 2020-06-19 09:28:05 +08:00
Jeff Tao 894fc1eddb reference count 2020-06-19 01:08:26 +00:00
dependabot[bot] 5c4debb69d
Bump jackson-databind in /tests/comparisonTest/opentsdb/opentsdbtest 
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10.4 to 2.10.0.pr1.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-18 16:41:17 +00:00
Shengliang Guan aa9a300a47
Merge pull request #2350 from taosdata/hotfix/crash 
[TD-543] coverity scan
 2020-06-19 00:12:45 +08:00
Shengliang Guan 5a2542f84a [TD-543] coverity scan 2020-06-18 16:11:28 +00:00
Hongze Cheng 496c5da86c TD-353 2020-06-18 16:10:50 +00:00
Hongze Cheng eb8f74e952 TD-353 2020-06-18 15:49:24 +00:00
Shengliang Guan 88c447b3f9
Merge pull request #2348 from taosdata/hotfix/TD-690 
Hotfix/td 690
 2020-06-18 19:04:13 +08:00
Hongze Cheng fe34e6a274 TD-353 2020-06-18 10:53:54 +00:00
Haojun Liao bdee045c56 [td-225] add cancel query support, fix bugs in load file blocks when column has already been updated. 2020-06-18 18:40:35 +08:00
Shengliang Guan b48c66c862
Merge pull request #2346 from taosdata/hotfix/sangshuduo/change-full-test-list 
change SIGINT to SIGKILL to make dnode5 be killed in balance2.sim
 2020-06-18 18:34:43 +08:00
Shengliang Guan 68929327da
Merge pull request #2347 from taosdata/patch/log-fmt-check 
implement format check for log
 2020-06-18 18:33:52 +08:00
Bomin Zhang 430e060acf implement format check for log 
and fix all format issues
 2020-06-18 18:32:17 +08:00
Shuduo Sang 2306992b63 Merge branch 'develop' into hotfix/sangshuduo/change-full-test-list 2020-06-18 18:19:41 +08:00
Shuduo Sang e8607b3bcf change SIGINT to SIGKILL to make dnode5 be killed. 2020-06-18 18:17:08 +08:00
Shengliang Guan 8a0ae7af4c scripts 2020-06-18 18:16:18 +08:00
Shengliang Guan 4ef4f60b50
Merge pull request #2345 from taosdata/hotfix/rpcAssert 
Hotfix/rpc assert
 2020-06-18 18:10:52 +08:00
Jeff Tao ff16a84d59 add comments 2020-06-18 10:07:06 +00:00
Hongze Cheng f3e633d910 Merge branch 'develop' into feature/2.0tsdb 2020-06-18 10:04:28 +00:00
Jeff Tao a615527835 free ID in the last step 2020-06-18 10:03:33 +00:00
Hongze Cheng 2f9e141512 TD-353 2020-06-18 10:02:23 +00:00
Shengliang Guan 6d92d8376a
Merge pull request #2344 from taosdata/hotfix/rpcAssert 
dont reset lockedBy
 2020-06-18 17:59:04 +08:00
Jeff Tao fa8af0d996 dont reset lockedBy 2020-06-18 09:55:47 +00:00
Shengliang Guan ac0f08da90 scripts 2020-06-18 17:49:18 +08:00
Shengliang Guan ac79a56f4c
Merge pull request #2343 from taosdata/hotfix/sangshuduo/change-full-test-list 
Hotfix/sangshuduo/change full test list
 2020-06-18 17:26:19 +08:00
Hongze Cheng 131be7b0da Merge branch 'develop' into feature/2.0tsdb 2020-06-18 09:25:43 +00:00
Shengliang Guan 3deb7f0e19
Merge pull request #2342 from taosdata/feature/query 
Feature/query
 2020-06-18 17:24:18 +08:00
Hongze Cheng f890114a41 TD-353 2020-06-18 09:24:09 +00:00
Shengliang Guan 2c3732e013
Merge pull request #2341 from taosdata/coverity_scan 
Coverity scan
 2020-06-18 17:24:02 +08:00
Shengliang Guan b82156a47c
Merge pull request #2335 from taosdata/bugfix/client-coverity 
fix some coverity issues
 2020-06-18 17:23:05 +08:00
plum-lihui ccd9cde5d1 Construct an empty result for later result checking 2020-06-18 17:22:43 +08:00
Shuduo Sang df11417aa6 fix conflicts. 2020-06-18 17:17:05 +08:00
Shuduo Sang b2a35f359b merge develop branch. 2020-06-18 17:13:54 +08:00
Shuduo Sang 0184233fd7 add verified case to regression and full test list. 2020-06-18 17:08:15 +08:00
Hongze Cheng 40b48c8980 TD-353 2020-06-18 09:06:42 +00:00
Bomin Zhang b7bee06a18 fix coverity issues continue 2020-06-18 16:59:24 +08:00
Bomin Zhang e83fd5043a fix some coverity issues 2020-06-18 16:49:13 +08:00
Haojun Liao 52014a25ad Merge remote-tracking branch 'origin/feature/query' into feature/query 2020-06-18 16:46:05 +08:00
Haojun Liao c31efb7044 [td-225] update script 2020-06-18 16:45:26 +08:00
Hongze Cheng 76b7e3c815 TD-353 2020-06-18 08:32:13 +00:00
Shengliang Guan c196808306
Merge pull request #2340 from taosdata/feature/query 
Feature/query
 2020-06-18 16:29:18 +08:00
Shengliang Guan f311f8aadf
Merge branch 'develop' into feature/query 2020-06-18 16:29:08 +08:00