Commit Graph

5317 Commits

Author SHA1 Message Date
root 091271b02d minor changes 2020-09-07 15:12:02 +08:00
Shengliang Guan 5e5750bde3
Merge pull request #3406 from taosdata/feature/mqtt
Feature/mqtt
2020-09-07 15:11:08 +08:00
Haojun Liao 75ddb1ff0c [td-225] fix bugs 2020-09-07 14:57:04 +08:00
Shengliang Guan fb26143c7c
Merge pull request #3407 from taosdata/master
Master
2020-09-07 14:37:38 +08:00
Shuduo Sang 1dad79456d 'minor' 2020-09-07 12:56:33 +08:00
Shengliang Guan 9487d607ae compile not pass even in some vs2013 environments 2020-09-07 12:35:34 +08:00
root a1b1b8ab11 scripts 2020-09-07 11:39:58 +08:00
root 07b38c1cac Merge remote-tracking branch 'origin/develop' into feature/mqtt 2020-09-07 11:24:24 +08:00
Shengliang Guan 95514381e8
Merge pull request #3394 from taosdata/feature/query
Feature/query
2020-09-06 12:13:27 +08:00
Shengliang Guan 25c0b8cbe9 [TD-1293 ]<fix>: monitor uses too many resources and may cause auth failure 2020-09-05 09:50:15 +00:00
Haojun Liao 401e729961 [td-1333] 2020-09-05 14:53:59 +08:00
Haojun Liao 3a54e379ad [td-1333] 2020-09-05 14:52:15 +08:00
Haojun Liao b98ed27fe4 [td-1315] 2020-09-05 13:27:19 +08:00
Haojun Liao 0f9543994a [td-1315] 2020-09-05 13:24:35 +08:00
Hui Li eb9a1f9655 [issue:3375] 2020-09-05 12:58:36 +08:00
root 189c30345f minor changes 2020-09-05 10:34:19 +08:00
Shengliang Guan 6aa2db02bb Merge from develop 2020-09-05 02:22:15 +00:00
Shengliang Guan a4419e1f98
Merge pull request #3383 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-09-05 09:35:57 +08:00
Haojun Liao cf03175916 [td-225] 2020-09-04 22:55:07 +08:00
Haojun Liao 8795d19009 [td-225] 2020-09-04 22:47:37 +08:00
Haojun Liao 10af6ae350 [td-225] 2020-09-04 22:31:12 +08:00
Haojun Liao bcee3a4ae9 [td-1334] refactor codes. 2020-09-04 22:26:49 +08:00
Bomin Zhang 379d574d7d fix TD-1334: select count(*) returns wrong result
github #3334
2020-09-04 18:29:51 +08:00
Shengliang Guan d3fb06fdf6
Merge pull request #3377 from taosdata/patch/td-804
td-804: fix infinite SQL parse retry
2020-09-04 17:59:06 +08:00
Hongze Cheng 9bf2f5c29a fix compile problem 2020-09-04 17:48:55 +08:00
Shengliang Guan 2932bc24bb TD-1224 update the uid generate algorithm 2020-09-04 09:36:54 +00:00
Shengliang Guan 083adfb4ae TD-1303 2020-09-04 08:46:08 +00:00
Shengliang Guan 4ae4d16043 TD-1323 allow first and second not to configure port 2020-09-04 08:36:29 +00:00
Hongze Cheng 3bdde80638 fix compile error 2020-09-04 16:35:32 +08:00
Hongze Cheng 10621dafd8 TD-1027 2020-09-04 16:06:28 +08:00
Hongze Cheng 7f56ba6056 TD-1027 2020-09-04 15:09:04 +08:00
Shuduo Sang f556ccac1d Merge branch 'develop' into feature/sangshuduo/snap 2020-09-04 14:36:09 +08:00
Shuduo Sang f21200d9f1 remove personalfiles interface. 2020-09-04 14:35:14 +08:00
Haojun Liao e9c0e7d2f1 [td-225] 2020-09-04 14:04:30 +08:00
Hongze Cheng b7584337ab add more functionality file 2020-09-04 13:57:04 +08:00
Haojun Liao bf8c9f7df3 [td-225] 2020-09-04 13:20:56 +08:00
Haojun Liao 510be65028 [td-1315] 2020-09-04 11:50:57 +08:00
Haojun Liao 39e55b2021 [td-1315] 2020-09-04 10:33:57 +08:00
Hongze Cheng 4f00e37d95 Merge branch 'develop' into feature/2.0tsdb 2020-09-04 09:26:42 +08:00
root a4da89b3ae Merge remote-tracking branch 'origin/develop' into feature/mqtt 2020-09-04 00:01:58 +08:00
Shengliang Guan 42f83c3cb0 TD-1310 minor changes 2020-09-03 15:35:54 +00:00
Shengliang Guan 932761a2e1 minor changes 2020-09-03 14:35:58 +00:00
Shengliang Guan 011ca825f9 TD-1310 Refactor the mqtt module codes 2020-09-03 14:29:40 +00:00
Bomin Zhang 139dabf151 td-804: fix infinite SQL parse retry 2020-09-03 18:47:47 +08:00
haojun Liao cb0def34ab
Merge pull request #3368 from taosdata/feature/query
[td-1308]
2020-09-03 18:38:58 +08:00
Haojun Liao 29a8c27dcb [td-1308] 2020-09-03 18:37:47 +08:00
Bomin Zhang 591f36f325 td-804: fix infinite SQL parse retry 2020-09-03 18:32:06 +08:00
Hongze Cheng 91d7c7748f refactor part of code 2020-09-03 17:21:23 +08:00
Haojun Liao 4db1086ed9 Merge remote-tracking branch 'origin/feature/query' into feature/query 2020-09-03 17:06:39 +08:00
Haojun Liao 19b0a7ccb7 [td-1322] 2020-09-03 17:05:07 +08:00
root 69da21ce33 Merge remote-tracking branch 'origin/develop' into feature/query 2020-09-03 16:25:02 +08:00
Haojun Liao ec56739527 [td-1317] 2020-09-03 16:17:48 +08:00
Shengliang Guan 60416be4ea TD-1310 2020-09-03 07:59:51 +00:00
Shengliang Guan b87ad41985 Merge remote-tracking branch 'origin/develop' into feature/mqtt 2020-09-03 05:57:32 +00:00
Haojun Liao b77b767a02 [td-1317] 2020-09-03 13:53:09 +08:00
Shengliang Guan 6d7509c7f5 Merge branch 'develop' into patch/td-804 2020-09-03 13:48:36 +08:00
Shengliang Guan ad04bca69f
Merge pull request #3360 from taosdata/feature/query
Feature/query
2020-09-03 11:04:35 +08:00
Haojun Liao 0ef20b379b [td-225] 2020-09-03 10:31:06 +08:00
Haojun Liao 8137a287b9 [td-225] fix last query bug and add some function definitions. 2020-09-03 10:28:02 +08:00
Bomin Zhang ab0d29f9a1 td-804: pass all smoke test 2020-09-03 09:43:35 +08:00
Shengliang Guan d75ce1715e TD-1310 2020-09-02 10:52:32 +00:00
Shengliang Guan d9865e1b91 compile error in windows 2020-09-02 17:37:05 +08:00
Shengliang Guan ff7794c0d6
Merge pull request #3353 from taosdata/feature/query
Feature/query
2020-09-02 17:28:19 +08:00
Shengliang Guan 20c31144fb
Merge pull request #3350 from taosdata/feature/TD-934
TD-934
2020-09-02 17:09:48 +08:00
Haojun Liao bc63c4e0bc [td-225] fix compiler error. 2020-09-02 17:07:44 +08:00
Haojun Liao 35c9252f19 [td-225] merge develop 2020-09-02 16:43:07 +08:00
root d5f380306e TD-1248 TD-1044 TD-1247 fix crash in tcache.c 2020-09-02 15:40:29 +08:00
Shengliang Guan d8b0d405e2
Merge pull request #3344 from taosdata/feature/os
Feature/os
2020-09-02 12:56:33 +08:00
Shengliang Guan da45887722 TD-1204 2020-09-02 12:03:19 +08:00
Haojun Liao b3c76157a1 [td-225] 2020-09-02 10:09:58 +08:00
Haojun Liao 88ba66dd8b [td-1290] 2020-09-02 10:08:35 +08:00
Shengliang Guan 1670cb5c16
Merge pull request #3335 from taosdata/master
Master
2020-09-01 18:11:13 +08:00
Bomin Zhang 89d87300d3 fix td-804 2020-09-01 18:04:05 +08:00
Shengliang Guan 44acc06316 TD-1204 2020-09-01 17:48:51 +08:00
Haojun Liao fb1178c452 [td-1302] 2020-09-01 17:35:37 +08:00
Shengliang Guan 992b6febe1 TD-1204 2020-09-01 16:53:47 +08:00
Hui Li 030d1fa459 [modify taosc name for oem power] 2020-09-01 15:40:20 +08:00
Shengliang Guan eaffad415c
Merge pull request #3329 from taosdata/master
Master
2020-09-01 14:31:38 +08:00
Hui Li 9adf8d2676 [del get version info from version.c] 2020-09-01 14:03:39 +08:00
Shengliang Guan 9ff439408b compile in windows 2020-09-01 13:25:53 +08:00
Shengliang Guan 17102c8eac
Merge pull request #3321 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-09-01 13:18:03 +08:00
Shengliang Guan eb9f101bc0
Merge pull request #3318 from taosdata/master
Merge from Master into Develop
2020-09-01 12:34:38 +08:00
Haojun Liao 2ae765caaf [td-1278] 2020-09-01 12:00:00 +08:00
haojun Liao f1f3d9aa60
Merge pull request #3311 from taosdata/feature/TD-1230
Feature/td 1230
2020-09-01 11:56:42 +08:00
Haojun Liao 9b75283859 [td-1250] 2020-09-01 11:40:34 +08:00
Shengliang Guan 1ca3e34d34 compile error in windows 2020-09-01 11:28:03 +08:00
Hongze Cheng 7074c95a9a add more check on data compress and decompress 2020-09-01 10:44:39 +08:00
Shengliang Guan 7b364249e9
Merge pull request #3306 from taosdata/feature/td-1099
natural interval
2020-09-01 09:46:31 +08:00
Hui Li bc5e56517a [TD-1256] 2020-08-31 17:30:59 +08:00
Hui Li bd66367877 [del taosnetwork dir] 2020-08-31 17:26:51 +08:00
Hui Li 3e15d4616d [TD-1256] 2020-08-31 17:26:03 +08:00
Hui Li 599760c6e3 [TD-1256] 2020-08-31 17:24:28 +08:00
Bomin Zhang e967332096 td-1099: natual interval in stream and bug fix 2020-08-31 17:12:50 +08:00
Haojun Liao 580448e381 [td-621] 2020-08-31 16:41:16 +08:00
Haojun Liao f3c92ad39b [td-1206] 2020-08-31 16:40:41 +08:00
Shengliang Guan 4e2fe07551
Merge branch 'develop' into hotfix/mergetodev1 2020-08-31 13:58:49 +08:00
yihaoDeng 09eb6ed916 TD-934 2020-08-31 05:41:22 +00:00
yihaoDeng 17b99416a2 TD-934 2020-08-31 05:28:43 +00:00
Shengliang Guan 29d2e3eead TD-1247 crash while release hash obj 2020-08-31 13:25:12 +08:00
Hui Li 018feb4101 [TD-181] 2020-08-31 11:39:11 +08:00
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