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

16101 Commits

Author SHA1 Message Date
Frozen 79389aaaaf fix issue of readlink 2019-12-20 11:53:06 +08:00
Frozen bf683119fa fix missing header of pthread.h 2019-12-20 11:52:58 +08:00
Frozen c04a890124 fix type error of __off_t 2019-12-20 11:52:45 +08:00
hjxilinx 568f874d12 fix bug in issue #969. [tbase-1368] 2019-12-20 11:43:29 +08:00
hjxilinx 14fe658f82 refactor some codes, remove the mmap of header file for super table query. issue #969 [tbase-1368] 2019-12-20 11:34:30 +08:00
slguan 3f19b39492
Merge pull request #967 from taosdata/hz_master 
add a simple assert
 2019-12-20 10:20:56 +08:00
slguan 1f6f94afae
Merge pull request #965 from taosdata/hzcheng 
add a simple assert
 2019-12-20 10:19:43 +08:00
Hongze Cheng b63241867c add a simple assert 2019-12-20 10:09:56 +08:00
Hongze Cheng 5b57c9ac55 add a simple assert 2019-12-20 09:57:13 +08:00
xieyinglin cc9626f438
Merge pull request #962 from taosdata/dependabot/npm_and_yarn/src/connector/grafana/tdengine/underscore.string-3.3.5 
Bump underscore.string from 3.3.4 to 3.3.5 in /src/connector/grafana/tdengine
 2019-12-20 09:55:45 +08:00
xieyinglin 1cd00f0cfb
Merge pull request #961 from taosdata/dependabot/npm_and_yarn/src/connector/grafana/tdengine/sshpk-1.16.1 
Bump sshpk from 1.10.2 to 1.16.1 in /src/connector/grafana/tdengine
 2019-12-20 09:54:49 +08:00
xieyinglin 44478b1f51
Merge pull request #960 from taosdata/dependabot/npm_and_yarn/src/connector/grafana/tdengine/lodash-4.17.13 
Bump lodash from 4.17.10 to 4.17.13 in /src/connector/grafana/tdengine
 2019-12-20 09:52:50 +08:00
xieyinglin 805f5a50b7
Merge pull request #959 from taosdata/dependabot/npm_and_yarn/src/connector/grafana/tdengine/extend-3.0.2 
Bump extend from 3.0.1 to 3.0.2 in /src/connector/grafana/tdengine
 2019-12-20 09:50:30 +08:00
dependabot[bot] 60f2df648f
Bump underscore.string in /src/connector/grafana/tdengine 
Bumps [underscore.string](https://github.com/epeli/underscore.string) from 3.3.4 to 3.3.5.
- [Release notes](https://github.com/epeli/underscore.string/releases)
- [Changelog](https://github.com/esamattis/underscore.string/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/epeli/underscore.string/compare/3.3.4...3.3.5)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-12-20 01:38:33 +00:00
dependabot[bot] cd092242a5
Bump sshpk from 1.10.2 to 1.16.1 in /src/connector/grafana/tdengine 
Bumps [sshpk](https://github.com/joyent/node-sshpk) from 1.10.2 to 1.16.1.
- [Release notes](https://github.com/joyent/node-sshpk/releases)
- [Commits](https://github.com/joyent/node-sshpk/compare/v1.10.2...v1.16.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-12-20 01:38:32 +00:00
dependabot[bot] 23a6bee2d2
Bump lodash from 4.17.10 to 4.17.13 in /src/connector/grafana/tdengine 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.13.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.10...4.17.13)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-12-20 01:38:31 +00:00
dependabot[bot] ef3f9bcdcd
Bump extend from 3.0.1 to 3.0.2 in /src/connector/grafana/tdengine 
Bumps [extend](https://github.com/justmoon/node-extend) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/justmoon/node-extend/releases)
- [Changelog](https://github.com/justmoon/node-extend/blob/master/CHANGELOG.md)
- [Commits](https://github.com/justmoon/node-extend/compare/v3.0.1...v3.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-12-20 01:38:31 +00:00
slguan 31ef0a7abd
Merge pull request #957 from taosdata/feature/grafana_plugin 
Feature/grafana plugin
 2019-12-20 09:37:52 +08:00
xieyinglin c47a3771c0 replace import dashboard image 2019-12-19 20:36:04 +08:00
xieyinglin c7148e4e47 Merge branch 'develop' into feature/grafana_plugin 2019-12-19 20:03:27 +08:00
xieyinglin d80af197d5 add support for custom template variable 2019-12-19 19:54:05 +08:00
slguan 0f06cbc5fd remove some warnings 2019-12-19 19:13:38 +08:00
haojun Liao 682bcb2d6d
Merge pull request #955 from taosdata/master 
merge master into develop
 2019-12-19 18:03:11 +08:00
haojun Liao c8fff94537
Merge pull request #954 from taosdata/feature/#928 
Data write request is not redirected in multiple copies, causing slow write speed
 2019-12-19 17:50:43 +08:00
haojun Liao 49df101592
Merge pull request #953 from taosdata/feature/lihui 
[TBASE-1360]
 2019-12-19 17:49:39 +08:00
slguan ed942e8f1c #952 [TBASE-1356] 2019-12-19 17:39:56 +08:00
lihui c159dd8ad7 [TBASE-1360] 2019-12-19 17:37:30 +08:00
haojun Liao 31ea35243f
Merge pull request #950 from taosdata/feature/#928 
SQL statement `show connections` may cause crash
 2019-12-19 17:25:08 +08:00
hjxilinx 5741c02651 opt query performance. 2019-12-19 14:59:48 +08:00
hjxilinx 399fa20915 refactor codes 2019-12-19 14:46:59 +08:00
slguan 96329ea18c #949 2019-12-19 14:09:03 +08:00
slguan a5805df141
Merge pull request #947 from taosdata/hjxilinx-patch-2 
Update vnodeQueryImpl.c
 2019-12-19 13:42:27 +08:00
slguan b9e05f05a7
Merge pull request #948 from taosdata/feature/liaohj 
fix bug in issue #946 [tbase-1363]
 2019-12-19 13:42:05 +08:00
hjxilinx 4c42be31b6 refactor code referred in issue #938 2019-12-19 13:37:36 +08:00
hjxilinx 897c23bd9a opt performance by removing the mmap operation 2019-12-19 13:33:12 +08:00
hjxilinx 24d93f5729 opt performance by removing the mmap during read header file 2019-12-19 13:31:31 +08:00
haojun Liao 50865d282e
Update vnodeQueryImpl.c 
fix a bug referred in issue #946
 2019-12-19 13:29:00 +08:00
hjxilinx a935e645f1 fix bug in issue #946 [tbase-1363] 2019-12-19 13:23:14 +08:00
slguan 7f2061e9d0
Merge pull request #943 from taosdata/hjxilinx-patch-1 
Update administrator-ch.md
 2019-12-19 10:21:40 +08:00
slguan c3fc348645
Merge pull request #942 from taosdata/feature/liaohj 
fix bug in issue #941 [tbase-1359]
 2019-12-19 10:21:32 +08:00
slguan c5e5f4c663
Merge pull request #940 from taosdata/patch/errmsg 
improve error message of multiple file import
 2019-12-19 10:21:02 +08:00
fangpanpan 827fad8210
Merge pull request #944 from taosdata/feature/lihui 
[TBASE-1162]
 2019-12-18 18:37:57 +08:00
plum-lihui 40fab98276 [TBASE-1162] 2019-12-18 17:59:17 +08:00
haojun Liao ec5eff1068
Update administrator-ch.md 2019-12-18 17:53:55 +08:00
hjxilinx 9e1db3f3db fix bug in issue #941 [tbase-1359] 2019-12-18 16:49:36 +08:00
localvar 6ace40b361 improve error message of multiple file import 2019-12-18 14:54:15 +08:00
fangpanpan 5f6325af7c
Merge pull request #939 from taosdata/feature/lihui 
[TBASE-1292]
 2019-12-18 14:49:40 +08:00
lihui a37ef5f24c [TBASE-1292] 2019-12-18 14:43:00 +08:00
hzcheng 868a243a05
Merge pull request #936 from taosdata/feature/#928 
Feature/#928
 2019-12-17 15:45:25 +08:00
slguan ef6df5093d
Merge pull request #933 from taosdata/feature/liaohj 
Feature/liaohj
 2019-12-17 15:22:05 +08:00