Commit Graph

27626 Commits

Author SHA1 Message Date
hjxilinx c12fb22e0a suppress compile warnings 2019-12-09 02:09:17 +08:00
hjxilinx 9794fe6c0a Merge branch 'develop' into feature/liaohj 2019-12-09 01:41:53 +08:00
hjxilinx 0c30d77ab3 fix bugs for high throughput of query request 2019-12-09 01:40:21 +08:00
slguan a29d9b8191 Merge branch 'feature/slguan' of https://github.com/taosdata/TDengine into feature/slguan 2019-12-08 22:47:27 +08:00
slguan 8fa7038ee6 [TBASE-1297] 2019-12-08 15:27:25 +08:00
Jeff Tao 5c4654fd0b
Merge pull request #876 from taosdata/feature/fangstatic
resolve static check warnings
2019-12-07 21:31:46 +08:00
Jeff Tao 50c85dfdd8
Merge branch 'develop' into feature/fangstatic 2019-12-07 21:31:24 +08:00
Jeff Tao e83174b3bb
Merge pull request #880 from taosdata/feature/slguan
Remove compiler warning options
2019-12-07 21:26:20 +08:00
slguan 9d8b9691dc
Merge pull request #879 from taosdata/feature/liaohj
Feature/liaohj
2019-12-07 21:17:40 +08:00
slguan 0ecb57cdeb
Merge branch 'develop' into feature/liaohj 2019-12-07 21:17:32 +08:00
slguan a20f3ef124 Merge branch 'develop' into feature/slguan 2019-12-07 20:59:56 +08:00
xieyinglin 3931a2f808
Merge pull request #877 from taosdata/feature/fangdoc
typo correction in english version of jdbc driver
2019-12-07 18:43:01 +08:00
hjxilinx 2f9d055696 [tbase-1282] 2019-12-07 18:40:14 +08:00
fang 56f4f42c0c Merge branch 'feature/fangstatic' of https://github.com/taosdata/TDengine into feature/fangstatic 2019-12-07 18:37:59 +08:00
fang bac9efd0d1 solve statich check question 2019-12-07 18:37:21 +08:00
fangpanpan 98eefc9422
Merge pull request #878 from taosdata/feature/lihui
[compile error]
2019-12-07 18:34:00 +08:00
lihui df80c3df68 [compile error] 2019-12-07 18:32:13 +08:00
fangpanpan cafdde229c
Update tscAst.c 2019-12-07 18:28:49 +08:00
fang 3ff4039b17 typo correction in english version of jdbc driver 2019-12-07 18:23:34 +08:00
fang 80cd0eec84 typo correction in english version of jdbc driver 2019-12-07 18:20:25 +08:00
xieyinglin 266cef5707
Merge pull request #875 from taosdata/feature/fangdoc
english version for jdbc driver
2019-12-07 18:16:34 +08:00
slguan b6fabc595c [TBASE-1315] 2019-12-07 18:14:26 +08:00
slguan 964b643bc8 [TBASE-1296] 2019-12-07 18:04:36 +08:00
fang 6a18a23873 resolve static check warnings 2019-12-07 18:00:10 +08:00
haojun Liao ad54000ab3
Merge pull request #874 from taosdata/feature/slguan
add some logs
2019-12-07 17:48:47 +08:00
slguan c246456c1f Remove compiler warning options 2019-12-07 17:39:46 +08:00
fang 2ed4d2b170 english version for jdbc driver 2019-12-07 17:18:18 +08:00
slguan e958793d14 Modify a wrong commit 2019-12-07 17:04:21 +08:00
slguan 02e39aab35 Merge branch 'develop' into feature/slguan 2019-12-07 16:43:07 +08:00
fangpanpan 4b15fd32af
Merge pull request #873 from taosdata/guanshengliang-patch-1-1
Update connector-ch.md
2019-12-07 16:06:32 +08:00
slguan 5c0b6a20c3
Update connector-ch.md 2019-12-07 16:06:09 +08:00
slguan 055c8743f1
Update connector-ch.md 2019-12-07 16:04:43 +08:00
haojun Liao 5cbac641ff
Merge pull request #871 from taosdata/feature/ylxie
add client config reference in java connector doc
2019-12-07 15:54:12 +08:00
fangpanpan 83bee30498
Merge pull request #872 from taosdata/feature/lihui
[TBASE-1292]
2019-12-07 15:45:25 +08:00
lihui ded1757cc6 [TBASE-1292] 2019-12-07 15:42:46 +08:00
xieyinglin c482f8aca6 add client config reference in java connector doc 2019-12-07 15:37:30 +08:00
hjxilinx 952cbdb2d6 Merge branch 'develop' into feature/liaohj 2019-12-07 15:32:52 +08:00
hjxilinx 60da89b58e refactor some codes, change the log output info 2019-12-07 15:27:06 +08:00
hjxilinx 4246517c9f [tbase-1282] 2019-12-07 15:24:52 +08:00
haojun Liao 571f0a708b
Merge pull request #866 from taosdata/feature/fangstatic
correct static warning
2019-12-07 15:12:31 +08:00
haojun Liao 8819938152
Merge pull request #867 from taosdata/feature/ylxie
Feature/ylxie
2019-12-07 15:10:55 +08:00
slguan b9a62d60dc
Merge pull request #869 from taosdata/hotfix/#868
fix #868
2019-12-07 15:03:45 +08:00
slguan 376be5b56d
Merge pull request #870 from taosdata/hotfix/#868
fix #868
2019-12-07 15:03:19 +08:00
fang a42cf81e86 correct static error, deference a null pointer 2019-12-07 15:02:24 +08:00
Hongze Cheng 79b2344c47 fix #868 2019-12-07 15:00:22 +08:00
fang 90b9967d6e correct static error, deference a null pointer 2019-12-07 14:58:01 +08:00
fang f71b582fd9 Merge branch 'develop' into feature/fangstatic 2019-12-07 14:02:34 +08:00
xieyinglin 4cde960e72 add java connector doc 2019-12-07 12:05:56 +08:00
xieyinglin 5935a0c4d7 add java connector doc 2019-12-07 12:05:05 +08:00
xieyinglin 35823e97d3 Merge branch 'develop' into feature/ylxie 2019-12-07 11:58:52 +08:00