Commit Graph

5317 Commits

Author SHA1 Message Date
yihaoDeng a67361ebb9 add test cast 2020-08-30 01:36:16 +00:00
Bomin Zhang 1afed4c067 td-1099: fix bug & compile error / add test cases 2020-08-29 17:18:14 +08:00
Hui Li 934f2c473d [TD-1228] 2020-08-29 16:16:02 +08:00
Hui Li 790c28f205 [TD-1228] 2020-08-29 16:07:53 +08:00
Bomin Zhang b3840db93e td-1099: natual month/year processing 2020-08-29 15:47:39 +08:00
Bomin Zhang fb19257a99 td-1099: parse natual month/year 2020-08-29 15:47:39 +08:00
Hui Li 57ec385903 [TD-1228] 2020-08-29 15:45:02 +08:00
Shengliang Guan c476eb0933
Merge pull request #3291 from taosdata/TD-1280-fix
update jdbc test cases
2020-08-29 15:10:15 +08:00
Shengliang Guan e363c01d40 Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-29 06:48:47 +00:00
zyyang aa59367c80 update jdbc test cases 2020-08-29 14:32:33 +08:00
zyyang 8a455cfd82 update jdbc test cases 2020-08-29 13:52:57 +08:00
zyyang 3f09fcb0b0 change the jdbc test cases 2020-08-29 13:34:52 +08:00
Shengliang Guan 544562af01 TD-1248 TD-1044 2020-08-29 03:43:53 +00:00
yihaoDeng 0bb8ca7d1b TD-1230 2020-08-28 18:35:12 +00:00
Shengliang Guan feebfa626e TD-1173 Invalid account permission settings 2020-08-28 08:31:51 +00:00
Shengliang Guan d09567c82b TD-1257 2020-08-28 06:42:05 +00:00
Shengliang Guan 3e9834c907 Merge remote-tracking branch 'origin/develop' into hotfix/sync 2020-08-28 05:51:32 +00:00
Shengliang Guan 28cef33a72 minor changes 2020-08-28 13:08:34 +08:00
Shengliang Guan e16572e459 Merge remote-tracking branch 'origin/fmaster/lihui' into feature/os 2020-08-28 13:04:25 +08:00
Hui Li 89744f4ba8 [release version modify] 2020-08-28 13:00:53 +08:00
Shengliang Guan ae8fbb6b21 TD-1090 compile error in windows 2020-08-28 11:57:40 +08:00
Shengliang Guan 9e97c25d3c
Merge pull request #3132 from taosdata/feature/query
Feature/query
2020-08-28 10:26:46 +08:00
Shengliang Guan 90367ca788 TD-1257 mnode module startup check condition is wrong 2020-08-27 15:21:37 +00:00
Shengliang Guan 5b42f5d586
Merge pull request #3271 from taosdata/master
Merge from master into develop
2020-08-27 22:47:54 +08:00
Haojun Liao 3c45dcdee9 [td-255] replace wcsncpy with memcpy 2020-08-27 22:26:37 +08:00
Shengliang Guan d9faca1c01
Merge pull request #3255 from taosdata/hotfix/sync
Hotfix/sync
2020-08-27 21:08:27 +08:00
Shengliang Guan 037f561c95
Merge pull request #3267 from taosdata/hotfix/TD-857
TD-857
2020-08-27 21:06:56 +08:00
Shengliang Guan 37c2d3eb7d minor changes 2020-08-27 13:06:19 +00:00
yihaoDeng df013fc336 TD-857 2020-08-27 11:13:20 +00:00
Haojun Liao 76ad0bc70e [td-255] add check for memory allocation failure. 2020-08-27 18:32:34 +08:00
Shengliang Guan bd908f4ab0
Merge branch 'develop' into mergetodevelop 2020-08-27 17:22:22 +08:00
Shengliang Guan 9028c1de9a
Merge pull request #3263 from taosdata/hotfix/connrelease
Update mnodeProfile.c
2020-08-27 17:20:29 +08:00
haojun Liao abc80f352e
Update mnodeProfile.c
Update the mnode connection activity time
2020-08-27 16:28:26 +08:00
Hui Li 460ae42c09 [TD-1203] 2020-08-27 16:20:48 +08:00
Shengliang Guan c225051429
Merge pull request #3257 from taosdata/hotfix/TD-1009
fixbug connection killing led floating point exception
2020-08-27 15:39:53 +08:00
Haojun Liao d5abee89dd [td-255] fix compiler error 2020-08-27 15:04:19 +08:00
Haojun Liao 13cd54637b [td-255] fix compiler error 2020-08-27 14:50:53 +08:00
yihaoDeng 65f750a087 fixbug connection killing led floating point exception 2020-08-27 06:47:59 +00:00
Shengliang Guan b3a78f8fea Merge remote-tracking branch 'origin/master' into hotfix/sync 2020-08-27 05:42:13 +00:00
Shengliang Guan 158f7b2ed6 TD-1201 change filesize from 32bits to 64bits 2020-08-27 05:42:02 +00:00
Shengliang Guan 383ca2f2cb Merge from master 2020-08-27 02:21:31 +00:00
Bomin Zhang 829caf39d3 td-1242: wait again if sem_wait returns EINTR 2020-08-27 10:12:54 +08:00
Bomin Zhang a393cc7524 fix td-1242 2020-08-27 09:26:31 +08:00
Shengliang Guan 942c70c5e0 minor changes 2020-08-26 13:27:43 +00:00
Shengliang Guan dd1278c6f9 TD-1090 remove version.c and add version to taos.dll 2020-08-26 19:08:07 +08:00
Haojun Liao 6e43fe5217 [td-621] 2020-08-26 18:24:25 +08:00
Shengliang Guan bd16bb3d23 TD-1214 change csharp driver in win32 2020-08-26 17:36:57 +08:00
Haojun Liao e1c7529961 Merge branch 'develop' into feature/query 2020-08-26 15:53:29 +08:00
Haojun Liao 53a7e3d62b [td-225] add test case for join query. 2020-08-26 15:51:52 +08:00
Shengliang Guan 06d188e982 minor changes 2020-08-26 06:47:19 +00:00
Shengliang Guan f9f9580f9a TD-1238 add error code while unable to resolve fqdn 2020-08-26 06:45:35 +00:00
Hui Li 6d7faf97f1 [update release ver info] 2020-08-26 12:09:54 +08:00
Shengliang Guan 8db3120147 TD-1236 native c# examples for 2.0 2020-08-26 11:15:24 +08:00
Haojun Liao 18637381a4 [td-1151] 2020-08-26 11:03:42 +08:00
Shengliang Guan 40fe952038
Merge pull request #3231 from taosdata/fmaster/lihui
Fmaster/lihui
2020-08-26 10:02:53 +08:00
Hui Li fffbef43e3 [TD-1132] 2020-08-25 20:09:06 +08:00
Shengliang Guan 00aaa44cff Merge remote-tracking branch 'origin/master' into hotfix/os 2020-08-25 18:23:25 +08:00
Hui Li 66a977df9c [TD-1132] 2020-08-25 17:43:47 +08:00
Hui Li 2bb07eb03f [TD-1132] 2020-08-25 17:40:27 +08:00
Shengliang Guan 92bff4ed55 TD-1090 rename some files 2020-08-25 16:59:16 +08:00
Shengliang Guan 8dbbfd7077
Merge pull request #3227 from taosdata/hotfix/connrelease
[td-1227]
2020-08-25 16:52:21 +08:00
Shengliang Guan 9f3ccbb26f Merge branch 'hotfix/os' of https://github.com/taosdata/TDengine into hotfix/os 2020-08-25 16:16:48 +08:00
Shengliang Guan 37c11dd8db TD-1090 first version of windows 32 client 2020-08-25 16:10:23 +08:00
Haojun Liao dffb6511e5 [td-1227] 2020-08-25 16:04:00 +08:00
Shengliang Guan 7c39b573a3
Merge pull request #3220 from taosdata/fmaster/lihui
[TD-1203]
2020-08-25 16:00:27 +08:00
Haojun Liao 73fcf1e1ce [td-1151] 2020-08-25 15:56:51 +08:00
Haojun Liao 2271ac9260 [td-1227] 2020-08-25 15:53:39 +08:00
Hui Li 6cca3cdcb9 [TD-1121] 2020-08-25 15:00:40 +08:00
Shengliang Guan a2a706a383 TD-1201 minor changes 2020-08-25 06:30:30 +00:00
Hui Li 37da0e660f [TD-1203] 2020-08-25 14:13:02 +08:00
Haojun Liao 77816db719 [td-225] 2020-08-25 10:57:35 +08:00
Haojun Liao a3e77f23fa [td-1213] 2020-08-25 10:56:53 +08:00
Shengliang Guan 3fb64ca0e2 minor changes 2020-08-24 15:11:29 +00:00
Shengliang Guan 99715c7b52 TD-1217 let monitor database can be dropped 2020-08-24 15:06:47 +00:00
Shengliang Guan 1b3e5d0f0c TD-1216 update normal table uid 2020-08-24 15:03:19 +00:00
Haojun Liao dac0a985c2 [td-1213] 2020-08-24 22:50:16 +08:00
Shengliang Guan 0ed403dd53 Merge remote-tracking branch 'origin/master' into feature/os 2020-08-24 11:52:22 +00:00
Shengliang Guan 374c05602c
Merge pull request #3208 from taosdata/fmaster/lihui
Fmaster/lihui
2020-08-24 19:49:08 +08:00
Hui Li c6c3d96cb5 [TD-880] 2020-08-24 18:18:48 +08:00
Hui Li ee5038ea85 [TD-880] 2020-08-24 18:12:43 +08:00
Hui Li 72a1a4bb46 [update version info] 2020-08-24 16:55:58 +08:00
Shengliang Guan af20a536cd TD-1212 2020-08-24 16:49:37 +08:00
Haojun Liao 5b5edf0026 [td-1010] add check for max interval time range. 2020-08-24 16:13:31 +08:00
Shengliang Guan 82d12eec6a TD-1201 fix compile error in centos 2020-08-24 16:02:49 +08:00
Haojun Liao ba9ef1377d [td-1151] add test cases and fix the found bugs. 2020-08-24 15:36:06 +08:00
Shengliang Guan 5ac0d1376e TD-1212 add replica paras for taosdemo 2020-08-24 07:15:02 +00:00
Shengliang Guan 72352f0367 TD-1205 add error code to crash_gen.py 2020-08-24 10:04:04 +08:00
Shengliang Guan 460ed644ff
Merge pull request #3179 from taosdata/TD-1174_feature
TD-1174: jdbc without host ip
2020-08-23 20:36:10 +08:00
Shengliang Guan 6c95affeea
Merge pull request #3186 from taosdata/bugfix/td-1127
fix two case of 'unexpected generic error in RPC'
2020-08-23 20:11:22 +08:00
Shengliang Guan 2f76b8c276
Merge pull request #3196 from taosdata/master
Master
2020-08-23 20:11:08 +08:00
Haojun Liao e4e4c7fcd3 [td-1067] 2020-08-22 23:02:12 +08:00
Haojun Liao 51290fd1aa [td-1067] 2020-08-22 19:02:58 +08:00
Haojun Liao 0fc1c8cdb5 [td-837] check mem after malloc 2020-08-22 17:50:12 +08:00
Hui Li c984139ca1 [TD-1196] 2020-08-22 16:41:09 +08:00
Haojun Liao 8ba7387e53 [td-225] refactor codes. 2020-08-22 16:00:22 +08:00
Hui Li 5682851c4e [TD-1048] 2020-08-22 15:46:22 +08:00
Haojun Liao 74fdb1c2aa [td-225] refactor shell code to support ctrl+c. 2020-08-22 13:24:33 +08:00
Haojun Liao f22098b6dd [td-225] refactor shell code. 2020-08-22 12:03:57 +08:00
Haojun Liao b16fa964d7 [td-225] refactor shell code. 2020-08-22 11:59:48 +08:00
Haojun Liao 2ad3133465 [td-225] refactor shell code. 2020-08-22 11:57:13 +08:00
Haojun Liao 3ff538c6cc [td-225] merge develop 2020-08-22 10:52:00 +08:00
zyyang 22248e87c2 TD-1174_feature: jdbc without host addr 2020-08-21 20:02:18 +08:00
Bomin Zhang 23948f67a7 fix td-1189 2020-08-21 09:32:00 +00:00
Haojun Liao 6c5ff84d2c [td-225] merge develop 2020-08-21 17:16:04 +08:00
Bomin Zhang 542e450f0a fix two case of 'unexpected generic error in RPC'
log an error message if failed to call `gethostname`.
don't update epset if peer returns empty epset.
2020-08-21 08:45:26 +00:00
zyyang 0a8d42b199 TD-1174: jdbc without host ip 2020-08-21 14:54:38 +08:00
Haojun Liao 3050af21b2 [td-225] add some logs. 2020-08-21 14:16:42 +08:00
Haojun Liao b28dde67ee [td-1067] update the tablemeta life time 2020-08-21 00:57:18 +08:00
Haojun Liao 084cbca717 [td-1067] fix bugs in lastrow query. 2020-08-21 00:15:08 +08:00
Haojun Liao 2c4aff8f52 [td-1067] fix bugs in lastrow query. 2020-08-20 23:58:35 +08:00
Haojun Liao c5cfeee493 [td-1067] fix bugs in lastrow query. 2020-08-20 23:40:39 +08:00
Shengliang Guan f55f133b6d Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-20 21:53:55 +08:00
Shengliang Guan a89293b936
Merge pull request #3154 from taosdata/hotfix/ready
TD-1184 add error code
2020-08-20 21:52:23 +08:00
Shengliang Guan 169a17bcb3 Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-20 13:40:04 +00:00
Shengliang Guan e1beb18c5a
Merge pull request #3170 from taosdata/master
Master
2020-08-20 19:18:59 +08:00
Shengliang Guan 0a43f30f00
Merge pull request #3168 from taosdata/fmaster/lihui
Fmaster/lihui
2020-08-20 19:16:43 +08:00
Haojun Liao a21bc56722 [td-225] merge develop 2020-08-20 18:49:28 +08:00
Haojun Liao 49f23d689d [td-1067] opt last_row queries 2020-08-20 18:08:31 +08:00
Shengliang Guan 80f73fa70b
Merge pull request #3162 from taosdata/master
merge from develop into masetr
2020-08-20 16:59:24 +08:00
Shengliang Guan 97d07a25bb TD-1090 minor changes 2020-08-20 16:38:40 +08:00
Hui Li 94c11e0f67 [TD-1162] 2020-08-20 16:37:35 +08:00
Shengliang Guan e53ebe94df TD-1090 compile client in windows 32 platform 2020-08-20 16:27:44 +08:00
Hui Li ce840b9de5 [update ver info] 2020-08-20 16:20:24 +08:00
Haojun Liao 760a8cd5be [td-255] sleep before retry 2020-08-20 15:15:25 +08:00
Shengliang Guan 984d3c3ac8
Merge pull request #3157 from taosdata/hotfix/jdbcmemleak
fix jdbc memory leaks. #3098
2020-08-20 15:11:01 +08:00
Haojun Liao fee9f74040 fix jdbc memory leaks. #3098 2020-08-20 15:01:09 +08:00
Shengliang Guan 465199b6c2
Merge pull request #3156 from taosdata/feature/sangshuduo/make-grafana-plugin-module
Feature/sangshuduo/make grafana plugin module
2020-08-20 14:32:49 +08:00
Haojun Liao c960858088 fix jdbc memory leaks. #3098 2020-08-20 14:24:11 +08:00
Haojun Liao 61622a73b1 [td-225] fix jdbc memory leaks. 2020-08-20 14:20:31 +08:00
Shuduo Sang 1cb69395f1 replace grafana with submodule 2020-08-20 14:02:51 +08:00
Shuduo Sang 0a3f894407 remove local grafana directory to prepare for submodule. 2020-08-20 13:56:21 +08:00
Haojun Liao 91275a73b6 [td-225] fix jdbc memory leaks. 2020-08-20 13:54:11 +08:00
Shengliang Guan 8960081486 TD-1184 send status msg to mnode on vnode changed 2020-08-20 05:52:06 +00:00
Shengliang Guan 7782318d1f TD-1184 add error code 2020-08-20 05:37:07 +00:00
Shengliang Guan 34d88f98bd
Merge pull request #3153 from taosdata/hotfix/jdbcmemleak
fix jdbc memleaks  #3098
2020-08-20 13:00:42 +08:00
Haojun Liao e9bba3cdd7 fix jdbc memleaks #3098 2020-08-20 10:43:43 +08:00
Shengliang Guan 05159cc9c2
Merge branch 'develop' into hotfix/mergemaster 2020-08-19 22:31:55 +08:00
Shengliang Guan 644749a348
Merge pull request #3146 from taosdata/fmaster/lihui
[TD-1171]
2020-08-19 22:29:59 +08:00
Shengliang Guan ab898c0607
Merge pull request #3144 from taosdata/hotfix/not_remove_file
not remove tsdb dir
2020-08-19 22:29:22 +08:00
Hui Li ac7da458e6 [TD-1171] 2020-08-19 19:23:03 +08:00
Hongze Cheng 1cda60b032 not remove tsdb dir 2020-08-19 18:09:49 +08:00
Hongze Cheng 5c466ce2a2 not remove tsdb dir 2020-08-19 18:05:36 +08:00
Shengliang Guan ecb7d9529b TD-1186 show database error while in different account 2020-08-19 09:58:54 +00:00
Shengliang Guan a175845887 minor changes 2020-08-19 05:55:00 +00:00
Haojun Liao 23876ceb76 [td-1103] merge develop 2020-08-19 10:33:34 +08:00
Shengliang Guan 6ff0bb47ea TD-1090 2020-08-19 09:58:05 +08:00
Haojun Liao 9031c50ca4 [td-1103] fix bugs 2020-08-19 01:22:36 +08:00
Shengliang Guan 1c2fbfea94
Merge pull request #3127 from taosdata/master
Master
2020-08-18 21:46:41 +08:00
Hui Li 1a9d37b597 [TD-1171] 2020-08-18 16:26:11 +08:00
Hui Li 4954164e32 [TD-1171] 2020-08-18 16:12:53 +08:00
Haojun Liao 2238b29ffe [td-1103] fix a typo 2020-08-18 15:51:52 +08:00
Haojun Liao 8972ebc101 [td-1103] refactor the structure for reducing memory consumption during interval query. 2020-08-18 15:50:52 +08:00
Shengliang Guan 06ca7659d6
Merge pull request #3119 from taosdata/hotfix/TD-1170
Hotfix/td 1170
2020-08-18 15:13:09 +08:00
Shengliang Guan 152867cb2d minor changes 2020-08-18 06:49:24 +00:00
Shengliang Guan 6484aaf8c2
Merge pull request #3117 from taosdata/hotfix/TD-1167-fix-coverity-problem
TD-1167 fix coverity problem
2020-08-18 14:41:44 +08:00
Shengliang Guan 0698465236 The mqtt test has not passed, there are memory leaks, waiting for reconstruction 2020-08-18 06:40:33 +00:00
yihaoDeng 7969af493a TD-1170 forbbiden func on tbname 2020-08-18 06:31:52 +00:00
yihaoDeng 4de2164b5f TD-1167 fix coverity problem 2020-08-18 06:10:21 +00:00
Shengliang Guan 436f4b788f
Merge pull request #3112 from taosdata/master
Merge from master into develop
2020-08-18 13:56:25 +08:00
Haojun Liao 1892645002 [td-1151] fix the coverity warnings 2020-08-18 13:24:04 +08:00
Haojun Liao 58bad4cf38 [td-1151] fix the coverity warnings 2020-08-18 13:18:49 +08:00
Shengliang Guan ab5693295e TD-1165 2020-08-18 02:11:33 +00:00
Haojun Liao 39618becb7 [td-1151] 2020-08-18 00:01:01 +08:00
Shengliang Guan 25fe2350d0 TD-1144 fix bug while redirect status msg 2020-08-17 15:35:36 +00:00
yihaoDeng 3d47697e03 TD-1167, fix coverity problem about client 2020-08-17 13:00:38 +00:00
Shengliang Guan a2fbca353a TD-1154 minor changes for windows compile 2020-08-17 17:56:43 +08:00
Shengliang Guan 3595d06a64 TD-1165 fix defects found by coverity scan 2020-08-17 09:47:00 +00:00
Shengliang Guan e89ab2c7d5 Merge remote-tracking branch 'origin/master' into hotfix/os 2020-08-17 17:37:26 +08:00
Shengliang Guan 920cfc5981 TD-1154 #1112 How to modify root's password when I have forgot it? 2020-08-17 08:41:55 +00:00
Hongze Cheng e80c5f3282 fix part of coverity scan problem 2020-08-17 14:44:50 +08:00
Hongze Cheng ac537df0d0 fix part of coverity scan problem 2020-08-17 14:28:46 +08:00
Shengliang Guan b9672029cf TD-1155 #2977 query result from rest interface is different from taos console 2020-08-17 03:45:33 +00:00
Hui Li 5fa71e9848 [update version] 2020-08-17 11:21:28 +08:00
Bomin Zhang 5994bed21b fix td-851 2020-08-17 11:18:48 +08:00
Shengliang Guan 74e53c6eb0
Merge pull request #3088 from taosdata/develop
Merge from develop into master
2020-08-16 23:26:21 +08:00
Shengliang Guan 3e024c8ec1
Merge pull request #3086 from taosdata/develop
Merge from develop into master
2020-08-16 19:55:26 +08:00
Hongze Cheng 051d2c33c6 fix compile error 2020-08-16 15:37:12 +08:00
Hongze Cheng df288e779e fix sync memory leak 2020-08-16 15:35:51 +08:00
Hongze Cheng b0c9fc3201 fix bug 2020-08-16 15:32:09 +08:00
Haojun Liao ff20d564ab [td-1109] 2020-08-15 23:05:07 +08:00
Haojun Liao 3e2ea659cb [td-225] fix bug in "show configs"; 2020-08-15 18:17:46 +08:00
Shengliang Guan bfac4364e7
Merge pull request #3082 from taosdata/feature/os
TD-1047 iconv compile options
2020-08-15 15:35:24 +08:00
Haojun Liao 5aff8962a4 [td-225] fix bugs in retrieve error. 2020-08-15 14:52:50 +08:00
Shengliang Guan acdcd47243 a crash generated by dn3_mn1_replica_change.sim 2020-08-15 14:52:38 +08:00
Haojun Liao 9f940295d6 [td-225] fix bugs during stable query with the fill option. 2020-08-15 14:24:58 +08:00
Shengliang Guan b114fb5150
Merge branch 'master' into hotfix/tomaster 2020-08-15 14:18:19 +08:00
Shengliang Guan 333934e77d
Merge pull request #3080 from taosdata/bugfix/td-1150
fix td-1150
2020-08-15 14:13:32 +08:00
Bomin Zhang c5ae6d2aaf fix td-1150 2020-08-15 13:43:20 +08:00
Shuduo Sang a6f1583f81 move macro definition position for random test. 2020-08-15 13:33:58 +08:00
Haojun Liao 8be56fb73c [td-1148] enable the binary tag to be used as the join condition. 2020-08-15 11:35:04 +08:00
Shengliang Guan c4f1db3ec7 TD-1057 not show error if create file failed 2020-08-14 18:50:29 +08:00
Shengliang Guan 7f885cb3b3 TD-1057 2020-08-14 09:39:56 +00:00
Shengliang Guan 8ac389c675 TD-1057 compile error after merge feature/query 2020-08-14 17:08:04 +08:00
Shengliang Guan 01f56ee5aa Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-14 17:05:09 +08:00
Shengliang Guan faabd6e5cb TD-1057 compile error in vs2019 2020-08-14 16:59:41 +08:00
Shengliang Guan d1d0ff479c
Merge pull request #3069 from taosdata/feature/query
Feature/query
2020-08-14 16:46:42 +08:00
Shengliang Guan fbb185a36b Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-14 15:24:20 +08:00
Haojun Liao 179f933eee Merge branch 'develop' into feature/query 2020-08-14 15:16:28 +08:00
Haojun Liao d7579e02a1 [td-225] fix the bugs in fill for interval query 2020-08-14 15:08:15 +08:00
Shengliang Guan c71ab49d6b TD-1143 2020-08-14 06:00:25 +00:00
Bomin Zhang dce8ec169e fix server&client side crash
in singe table subscription, after consume all data, the next call to consume crash both client and server.

this commit fix the issue.
2020-08-14 13:28:10 +08:00
Bomin Zhang 4dd4342561 fix td-1142 2020-08-14 13:26:41 +08:00
Shengliang Guan 712d8d6625
Merge pull request #3066 from taosdata/feature/2.0tsdb
try to solve sync problem
2020-08-14 11:31:25 +08:00
Haojun Liao 21f0afe535 [td-225] add todo 2020-08-14 11:12:06 +08:00
Haojun Liao 7c4f8f6464 [td-225] fix bug while multiple tags exists during fill results 2020-08-14 11:04:26 +08:00
Jeff Tao 91904ee502 inotfiy events 2020-08-14 02:41:44 +00:00
Haojun Liao 07e2f96115 [td-225] fix error in closing the conns. 2020-08-13 23:29:13 +08:00
Haojun Liao cfc7da145c [td-225] fix a typo 2020-08-13 23:25:47 +08:00
Hongze Cheng 37e11f9b04 try to solve sync problem 2020-08-13 21:16:53 +08:00
Haojun Liao 6ce1c1a13f [td-225] add some logs. 2020-08-13 17:01:40 +08:00
Shengliang Guan 6554a5356d
Merge pull request #3033 from taosdata/feature/os
TD-1057 set crash in windows
2020-08-13 16:24:41 +08:00
Bomin Zhang b622154f69 update java subscription interface 2020-08-13 15:42:29 +08:00
Haojun Liao 26b4478db8 Merge branch 'develop' into feature/query 2020-08-13 15:42:28 +08:00
Shengliang Guan 4b9a6ef5c3 Merge branch 'develop' into feature/os 2020-08-13 15:37:44 +08:00
Haojun Liao d1382a7a04 [td-225] refactoring codes. 2020-08-13 15:07:04 +08:00
Haojun Liao dcf17ab093 [td-225] check errors from tsdb 2020-08-13 15:06:22 +08:00
Hui Li e75dfd46b1 Merge branch 'develop' into hotfix/test 2020-08-13 14:56:32 +08:00
Hui Li 69fd772766 [TD-1134] 2020-08-13 13:26:28 +08:00
Haojun Liao 2405590978 [td-225] minor refactoring. 2020-08-13 12:01:25 +08:00
Haojun Liao 9ab57b25ec [td-225] set the colId for tag columns. 2020-08-13 11:39:56 +08:00
Haojun Liao fa0b77d19b [td-225] add log if malloc failed. 2020-08-13 11:39:00 +08:00
Haojun Liao 7bcd7447eb [td-225] return error code in tsdb to client during the data retrieval. 2020-08-13 11:37:42 +08:00
Haojun Liao 607d4fd238 [td-225] add check if cache is destoried. 2020-08-13 11:36:03 +08:00
Haojun Liao 3867d5e863 [td-225] set the correct object for extracting error msg 2020-08-13 11:31:57 +08:00
zyyang ecdf1ce5ec fix TD-1115 in master branch 2020-08-13 11:12:50 +08:00
Shengliang Guan c989370b30 Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-13 01:03:21 +08:00
Shengliang Guan 4d9c3488ce
Merge pull request #3045 from taosdata/feature/query
[td-225] fix bugs.
2020-08-13 01:02:13 +08:00
Haojun Liao 259928d4de [td-225] fix bugs. 2020-08-13 00:59:49 +08:00
Shengliang Guan c817db3786 Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-13 00:57:33 +08:00
Shengliang Guan 19181af91c
Merge pull request #3044 from taosdata/feature/query
Feature/query
2020-08-13 00:37:44 +08:00
Haojun Liao 86032d83e5 [td-225] restrict the number of tags assignment. 2020-08-13 00:35:10 +08:00
Shengliang Guan bd6f9ee918 TD-1047 change some definitions in arm64 platform 2020-08-13 00:17:48 +08:00
Shengliang Guan dda20b1e7a Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-12 23:54:15 +08:00
Shengliang Guan 570cb56172
Merge pull request #3043 from taosdata/develop
Merge from develop
2020-08-12 23:42:30 +08:00
Shengliang Guan e1cf6ca15c
Merge pull request #3042 from taosdata/feature/query
Feature/query
2020-08-12 22:54:53 +08:00
Haojun Liao d7d840cc97 [td-225] remove invalid assert 2020-08-12 22:49:52 +08:00
Shengliang Guan e826a65dc8 TD-1047 undefine linux64 while cputype is aarch64 2020-08-12 22:48:28 +08:00
Shengliang Guan 70be4639a3 TD-1047 change include files 2020-08-12 22:39:10 +08:00
Shengliang Guan ae787ac904 TD-1124 httpPort can not configured by serverPort 2020-08-12 22:19:36 +08:00
Shengliang Guan 3c16d222e4
Merge pull request #3039 from taosdata/develop
Merge from develop into TD-1115_hotfix
2020-08-12 17:42:31 +08:00
Shengliang Guan 4fb5729896 Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-12 17:28:48 +08:00
Shengliang Guan d63c90b5a3 record log error, while fqdn too long 2020-08-12 08:28:16 +00:00
gemini 37aa0504aa fix TD-1115 2020-08-12 16:02:25 +08:00
Haojun Liao 6bb0054931 [td-225] remove invalid ts assert 2020-08-12 14:57:32 +08:00
Shengliang Guan 94d0aa193d TD-1057 set crash in windows 2020-08-12 14:44:09 +08:00
Shengliang Guan f790a124b1 localtime func crash in windows 2020-08-12 05:14:59 +00:00
Xiaxin Li 7da7b6177c
Merge pull request #3026 from taosdata/feature/2.0tsdb
fix .h file coredump
2020-08-12 13:04:31 +08:00
Bomin Zhang 6418035f3e temporary fix of negative time 2020-08-12 11:05:34 +08:00
Hongze Cheng 5615c021c2 fix .h file coredump 2020-08-12 10:46:22 +08:00
Shengliang Guan 55125ecfd9
Merge pull request #3013 from taosdata/hotfix/TD-1041
[TD-1041] bugfix
2020-08-11 23:30:35 +08:00
Shengliang Guan c0ebe69d8e
Merge pull request #3024 from taosdata/feature/query
[td-225] add unlock read lock of tsdb.
2020-08-11 23:30:13 +08:00
Haojun Liao 4b9e42eba2 [td-225] add unlock read lock of tsdb. 2020-08-11 23:23:38 +08:00
Shengliang Guan 2bd372877b TD-1057 minor changes 2020-08-11 18:35:01 +08:00
Shengliang Guan ad4157d2ba TD-1057 minor changes 2020-08-11 18:19:56 +08:00
Shengliang Guan bbf13c5e03 Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-11 17:59:03 +08:00
Shengliang Guan 1e24b99534 TD-1057 system function in windows 2020-08-11 17:58:41 +08:00
Shengliang Guan 1169eba1c8 TD-1057 crash in windows 2020-08-11 17:27:13 +08:00
Shengliang Guan 7b44af18f2
Merge pull request #3014 from taosdata/bugfix/td-1114
fix td-1114
2020-08-11 17:14:24 +08:00
Hui Li 32c81edca4 [fix bug] 2020-08-11 17:03:48 +08:00
Shengliang Guan 09072fba18 TD-1057 localtime func may crash while input < 0 in windows 2020-08-11 16:45:01 +08:00
Bomin Zhang c505914b04 fix td-1114 2020-08-11 14:01:28 +08:00
Shengliang Guan 8f886b890a
Merge pull request #3011 from taosdata/feature/os
Feature/os
2020-08-11 13:00:57 +08:00
Shengliang Guan 3b8b8414f3 minor changes 2020-08-11 04:52:44 +00:00
Shengliang Guan fe834cc75d only drop one vnode each time 2020-08-11 04:43:57 +00:00
Shengliang Guan 88171545f8 TD-1081 change cache key 2020-08-11 03:58:41 +00:00
Hongze Cheng 082584e439 fix TD-1112 2020-08-11 11:36:01 +08:00
Shengliang Guan 618c64192c Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-11 11:09:20 +08:00
Shengliang Guan 5d5137adac
Merge pull request #2984 from taosdata/hotfix/test
Hotfix/test
2020-08-11 11:02:02 +08:00
Shengliang Guan 916c8246ad
Merge pull request #3009 from taosdata/feature/query
[td-255]fix bugs in table alias name.
2020-08-11 10:56:18 +08:00
Hui Li f1e19aae4c [fix bug] 2020-08-11 10:33:17 +08:00
Shengliang Guan 6702061f68 Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-11 09:51:48 +08:00
Shengliang Guan 49944faf7d TD-1081 change httpContext keep time 2020-08-11 09:47:23 +08:00
Shengliang Guan fe6f96b1ce
Merge pull request #3002 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-08-11 09:42:37 +08:00
Shengliang Guan 3484f25153
Merge pull request #3005 from taosdata/feature/os
Feature/os
2020-08-11 09:36:32 +08:00
Hui Li 99753ae08e Merge branch 'develop' into hotfix/test 2020-08-11 09:24:48 +08:00
Haojun Liao 36c43566da [td-255]fix bugs in table alias name. 2020-08-11 00:50:09 +08:00
Shengliang Guan 0ac540218a TD-1057 minor changes 2020-08-10 23:57:14 +08:00
Shengliang Guan 2dfcac405a TD-1057 change pthread_t to int64 2020-08-10 23:51:53 +08:00
eurake d7ed734e9f
Update CMakeLists.txt 2020-08-10 23:44:09 +08:00
Shengliang Guan d4f3954891 TD-1057 change compile errors 2020-08-10 23:22:01 +08:00
Shengliang Guan d776f10dae TD-1057 2020-08-10 14:02:14 +00:00
Haojun Liao 7e4cf6511a [td-255]remove unused functions. 2020-08-10 19:05:00 +08:00
Hongze Cheng eb9e42eece Merge branch 'develop' into feature/2.0tsdb 2020-08-10 19:01:03 +08:00
Hongze Cheng 9eafba461f TD-1102 2020-08-10 18:58:25 +08:00
Shengliang Guan 5aae4b9078 TD-1057 first compile version of windows 64 client 2020-08-10 18:46:20 +08:00
Haojun Liao f6712d984a [td-255]remove unused functions. 2020-08-10 18:43:16 +08:00
Haojun Liao 98cec99dc1 [td-255] fix counting value error bug. 2020-08-10 18:30:16 +08:00
Shengliang Guan 4bd41a0fbf TD-1057 2020-08-10 18:17:14 +08:00
Haojun Liao dcfab65c6a [td-255] fix errors. 2020-08-10 18:10:06 +08:00
Haojun Liao 40318cc50e [td-255] merge develop 2020-08-10 17:58:09 +08:00
Shengliang Guan 03a29a618f
Merge branch 'develop' into master 2020-08-10 17:42:06 +08:00
Haojun Liao e00d072887 [td-1101] add time range check, fix bugs for projection query. 2020-08-10 17:38:09 +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 41d97eeea7 TD-1057 2020-08-09 15:21:03 +00:00
Shengliang Guan a9cabb54fa TD-1057 2020-08-09 22:59:42 +08:00
yihaoDeng c9ac6b03e0 set tag conditions limit 2020-08-09 14:23:08 +00:00
Shengliang Guan 0ef2db2646
Merge pull request #3034 from taosdata/feature/query
[td-225] remove invalid ts assert
2020-08-12 14:59:37 +08:00
Shengliang Guan ceab359b91 TD-1057 2020-08-09 20:59:23 +08:00
Shengliang Guan 90173d94c8 TD-1102 2020-08-09 05:33:08 +00:00
Jeff Tao fb4a40260b if redirect does not include Ep List, treat it as NOT_READY 2020-08-09 04:52:47 +00:00
yihaoDeng 448dbb0bd0 [TD-1041] bugfix 2020-08-08 20:08:02 +00: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
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
Haojun Liao c1b3156563 [td-225] fix memory leak 2020-08-08 17:48:08 +08:00
Hui Li e7bd0ca7f1 [TD-662] 2020-08-08 17:35:24 +08:00
Hongze Cheng 222ebe3602 add file size statistics 2020-08-08 17:14:57 +08:00
Hui Li 09129d8f29 Merge branch 'hotfix/test' of https://github.com/taosdata/TDengine into hotfix/test 2020-08-08 17:11:33 +08:00
Hui Li 2136789e85 [TD-662] 2020-08-08 17:09:33 +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
Haojun Liao 8e30461cff [td-225] fix memory leak 2020-08-08 16:33:38 +08:00
Shengliang Guan 0bc29a0130 TD-1057 2020-08-08 14:51:46 +08:00
Haojun Liao 4706b400d0 [td-225] fix invalid read. 2020-08-08 14:18:58 +08:00
Haojun Liao a945922c67 [td-225] fix invalid read. 2020-08-08 13:44:26 +08:00
Bomin Zhang 2b36e2a2c3 add and update testcases 2020-08-08 13:06:30 +08:00
Bomin Zhang 941705c5d6 td-1089: fix memory leak and invalid read 2020-08-08 13:05:15 +08:00
Bomin Zhang 1d7626df1c fix several bugs related to subscribe
including:
* server side crash
* client side crash
* server side memory leak
2020-08-08 13:05:15 +08:00
Shengliang Guan 7e3cd84df0 TD-1057 2020-08-08 13:04:29 +08:00
Shengliang Guan a18e287ca5 TD-1057 2020-08-08 11:06:32 +08:00
Haojun Liao 3c27860216 [td-225] 2020-08-08 10:55:27 +08:00
Haojun Liao aea35d6b23 [td-225] fix bugs. 2020-08-08 10:35:57 +08:00
Shengliang Guan d593a90581 Merge branch 'develop' into feature/os 2020-08-08 09:39:24 +08:00
Shengliang Guan 87a73142a1 TD-1057 2020-08-07 19:28:05 +08:00
Shengliang Guan 1db9831c5a TD-1057 2020-08-07 19:04:48 +08:00
Shengliang Guan ef2f966da5 TD-1057 2020-08-07 18:59:52 +08:00
Haojun Liao 9f3c81505f Merge remote-tracking branch 'origin/feature/query' into feature/query 2020-08-07 17:45:09 +08:00
Haojun Liao 562e62e933 [td-225] add check after killing query. 2020-08-07 17:44:32 +08:00
Hongze Cheng 17e1c19b81 remove Idx file 2020-08-07 09:30:52 +00:00
Shengliang Guan 8e53280b3c TD-1057 2020-08-07 16:58:55 +08:00
Shengliang Guan c78e82c2e6 Merge branch 'hotfix/test' of https://github.com/taosdata/TDengine into hotfix/test 2020-08-07 15:55:45 +08:00
Shengliang Guan 5ede107b94 minor changes for cmake 2020-08-07 15:54:51 +08:00
Shengliang Guan 791b290cf8 Merge branch 'feature/query' of https://github.com/taosdata/TDengine into feature/query 2020-08-07 06:48:37 +00:00
Shengliang Guan 364e3f52b3 minor changes 2020-08-07 06:48:28 +00:00
Hui Li 0ba581ec3d [add error log for flock] 2020-08-07 14:48:13 +08:00
Haojun Liao 24aa1a357d [td-979] 2020-08-07 14:47:32 +08:00
Haojun Liao b2c166213b [td-225] add check after killing query. 2020-08-07 14:37:14 +08:00
Shengliang Guan 7038a9926b
Merge pull request #2973 from taosdata/master
Master
2020-08-07 14:20:45 +08:00
Shengliang Guan 60737e167e
Merge pull request #2972 from taosdata/hotfix/platform
Hotfix/platform
2020-08-07 14:20:10 +08:00
Shengliang Guan 61a755e310 TD-1096 2020-08-07 14:17:33 +08:00
Shengliang Guan c622094fc7 TD-1096 2020-08-07 14:12:41 +08:00
Haojun Liao 0ee12789dd [td-225]update test cmake 2020-08-07 14:12:30 +08:00
Haojun Liao 68ca5f5225 [td-225]fix memory leaks. 2020-08-07 14:11:47 +08:00