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

7013 Commits

Author SHA1 Message Date
Ping Xiao bc73587498 udpate taos-jdbcdriver version for jdbc demos 2020-08-10 18:52:05 +08:00
Shengliang Guan bc492a3f99
Merge pull request #2999 from taosdata/master 
Master
 2020-08-10 17:42:18 +08:00
Shengliang Guan 03a29a618f
Merge branch 'develop' into master 2020-08-10 17:42:06 +08:00
Shengliang Guan cd8e71f880
Merge pull request #2998 from taosdata/hotfix/blockiter 
Hotfix/blockiter
 2020-08-10 17:40:14 +08:00
Shengliang Guan 16ca0b9549
Merge pull request #2997 from eurake/patch-2 
Update cluster-ch.md
 2020-08-10 17:39:46 +08:00
Haojun Liao e00d072887 [td-1101] add time range check, fix bugs for projection query. 2020-08-10 17:38:09 +08:00
eurake 8aad94d7eb
Update cluster-ch.md 
删除多余英文字符
 2020-08-10 17:31:12 +08:00
Shengliang Guan 22cbd9627c
Merge pull request #2995 from taosdata/feature/2.0tsdb 
Feature/2.0tsdb
 2020-08-10 17:05:51 +08:00
Haojun Liao 2cee0797b4 [td-1101]add some logs 2020-08-10 15:56:41 +08:00
Hongze Cheng d7cc7d9ec2 Merge branch 'develop' into feature/2.0tsdb 2020-08-10 11:25:19 +08:00
Hongze Cheng 1f66342c4b remove part of assert 2020-08-10 11:12:16 +08:00
Shengliang Guan 5c73b49b83
Merge pull request #2989 from taosdata/feature/platform 
TD-1102
 2020-08-10 10:10:44 +08:00
Hongze Cheng 77cfb02ea0 add file size statistics 2020-08-10 09:59:15 +08:00
Hongze Cheng 30d98e1aeb Merge branch 'develop' into feature/2.0tsdb 2020-08-10 09:50:12 +08:00
Shengliang Guan 863d6567b5
Merge pull request #2994 from taosdata/fix_taos_sql_typo 
fix typo in taos sql md file
 2020-08-09 23:49:42 +08:00
Ping Xiao 9ccdaec95d fix typo in taos sql md file 2020-08-09 23:25:43 +08:00
Shengliang Guan 87ae9756e7
Merge pull request #2992 from taosdata/feature/sangshuduo/perftest-script-improve 
add influxdb write loop test script.
 2020-08-09 20:56:57 +08:00
Shengliang Guan bd9485d44d
Merge pull request #2991 from taosdata/hotfix/sangshuduo/fix-influxdb-test-timeout-error 
fix influxdbTest timeout error.
 2020-08-09 20:50:20 +08:00
Shuduo Sang 6cfbaefea7 add influxdb write loop test script. 2020-08-09 09:48:24 +00:00
Ubuntu 8241585870 fix influxdbTest timeout error. 
[TD-1051]
 2020-08-09 09:45:07 +00:00
Shengliang Guan 17535e78be
Merge pull request #2990 from taosdata/feature/sangshuduo/perftest-script-improve 
Feature/sangshuduo/perftest script improve
 2020-08-09 17:16:36 +08:00
Shuduo Sang 64be6eb4c6 Merge branch 'feature/sangshuduo/perftest-script-improve' of https://github.com/taosdata/TDengine into feature/sangshuduo/perftest-script-improve 2020-08-09 16:12:43 +08:00
Shuduo Sang 4ae1387995 add opentsdb query loop test script. 2020-08-09 16:12:10 +08:00
Shuduo Sang cced7da57e add opentsdb query loop test script. 2020-08-09 16:10:06 +08:00
Shengliang Guan 0e89d9e641
Merge pull request #2988 from taosdata/hotfix/TD-1094 
if redirect does not include Ep List, treat it as NOT_READY
 2020-08-09 15:12:53 +08:00
Shengliang Guan 90173d94c8 TD-1102 2020-08-09 05:33:08 +00:00
Shengliang Guan 69242440d4
Merge pull request #2987 from taosdata/hotfix/sangshuduo/fix-opentsdb-test-ip 
fix hard code ip in query code.
 2020-08-09 13:08:16 +08:00
Jeff Tao fb4a40260b if redirect does not include Ep List, treat it as NOT_READY 2020-08-09 04:52:47 +00:00
Shuduo Sang f96e7864b3 Merge branch 'feature/sangshuduo/perftest-script-improve' of https://github.com/taosdata/TDengine into feature/sangshuduo/perftest-script-improve 2020-08-09 12:39:46 +08:00
Shuduo Sang 2118830b90 fix hard code ip in query code. 2020-08-09 12:37:10 +08:00
Shengliang Guan b0bb0e4948
Merge pull request #2986 from taosdata/feature/os 
Feature/os
 2020-08-09 00:32:43 +08:00
Shengliang Guan e875e993ac
Merge branch 'develop' into feature/os 2020-08-09 00:32:29 +08:00
Shengliang Guan affb005ca2
Merge pull request #2983 from taosdata/bugfix/td-1089 
Bugfix/td 1089
 2020-08-09 00:30:53 +08:00
slguan 592b9d1cd1 scripts 2020-08-08 23:15:23 +08:00
slguan 976b4e863a scripts 2020-08-08 23:06:02 +08:00
Shengliang Guan b1473342e4 TD-1057 2020-08-08 21:34:56 +08:00
Shengliang Guan 95f764060c Merge remote-tracking branch 'origin/bugfix/td-1089' into feature/os 2020-08-08 21:04:14 +08:00
Shengliang Guan 0546c7ab85 Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-08 21:03:57 +08:00
Shengliang Guan 22a31e98c1
Merge pull request #2985 from taosdata/hotfix/memleak 
[td-225] fix memory leak
 2020-08-08 21:02:16 +08:00
Haojun Liao 16ac4b66c9 [td-225] fix memory leak 2020-08-08 18:07:51 +08:00
Shengliang Guan ab6151cd90 TD-1057 2020-08-08 17:52:48 +08:00
Hongze Cheng 222ebe3602 add file size statistics 2020-08-08 17:14:57 +08:00
Shengliang Guan 7444fe7a84 Merge branch 'feature/os' of https://github.com/taosdata/TDengine into feature/os 2020-08-08 16:39:37 +08:00
Shengliang Guan ef8135a609 TD-1057 2020-08-08 16:38:44 +08:00
Hongze Cheng bd7cb46ae4 Merge branch 'develop' into feature/2.0tsdb 2020-08-08 15:23:57 +08:00
Shengliang Guan 0bc29a0130 TD-1057 2020-08-08 14:51:46 +08:00
Shengliang Guan 691e4c1700 Merge branch 'feature/os' of https://github.com/taosdata/TDengine into feature/os 2020-08-08 14:25:19 +08:00
Shengliang Guan 9947514b3d Merge branch 'develop' into feature/os 2020-08-08 13:17:17 +08:00
Shengliang Guan ed896f976b TD-1057 2020-08-08 13:14:12 +08:00
Bomin Zhang 2b36e2a2c3 add and update testcases 2020-08-08 13:06:30 +08:00