Commit Graph

4203 Commits

Author SHA1 Message Date
Shengliang Guan 0f69f280ba
Merge pull request #2019 from taosdata/feature/query
Feature/query
2020-05-25 11:02:11 +08:00
Shengliang Guan ad590b01fe
Merge pull request #2022 from taosdata/hotfix/sync
getFileInfo bug
2020-05-25 09:59:37 +08:00
Jeff Tao 77ef030ef1 getFileInfo bug 2020-05-25 01:41:05 +00:00
Steven Li 636249571b Merge remote-tracking branch 'origin/develop' into feature/crash_gen 2020-05-24 15:15:20 -07:00
Steven Li 5b4e7a6d54 refactoring, added exec stats, re-orged task/state relationships 2020-05-24 15:15:05 -07:00
Haojun Liao 29f4cea279 [td-225] merge with develop branch 2020-05-24 22:56:29 +08:00
Haojun Liao 569bde3044 [td-225]update the basic.txt 2020-05-24 22:54:06 +08:00
Haojun Liao 5f3fce3577 [td-225]fix crash in parsing the following sql: create table t1 as select count(*); 2020-05-24 22:44:21 +08:00
Haojun Liao f8564866c9 [td-225] fix bugs in data block statistics generation 2020-05-24 22:41:29 +08:00
Haojun Liao c4fe461f72 [td-225] fix bugs in diff and spread 2020-05-24 22:41:01 +08:00
Haojun Liao be67158538 [td-225] update the sim script 2020-05-24 22:40:07 +08:00
Shengliang Guan 282d29815f
Merge pull request #2018 from taosdata/hotfix/mgmt
Hotfix/mgmt
2020-05-24 21:27:39 +08:00
Shengliang Guan 54d0511ea5 script 2020-05-24 21:07:24 +08:00
Shengliang Guan a585b1d9be [TD-413] dnode may be null if mnode list changed 2020-05-24 20:58:54 +08:00
Shengliang Guan 69ff10db2c
Merge pull request #2017 from taosdata/hotfix/tcpClient
for TCP client, dont set socket option
2020-05-24 17:52:17 +08:00
MysticBoy 46819851de revert example's makefile 2020-05-24 17:11:09 +08:00
MysticBoy cef5986602 use MQTT-C 2020-05-24 16:58:21 +08:00
Tao Liu eb6b6e0c74 [TD-90] alter tag function develop 2020-05-24 08:48:51 +00:00
Steven Li 2416465519 fixed a few bugs in state transition checks 2020-05-24 00:47:58 -07:00
MysticBoy 331c454425 remove paho.mqtt.c 2020-05-24 15:13:20 +08:00
Jeff Tao 3a7570d21b for TCP client, dont set socket option 2020-05-24 06:12:32 +00:00
MysticBoy e61cb0e382 Merge remote-tracking branch 'remotes/origin/develop' into feature/mqtt 2020-05-24 12:56:02 +08:00
MysticBoy cb9ce34d06 Reconnect Mqtt Broker when connection fails 2020-05-24 12:54:48 +08:00
MysticBoy df503b11ab Refactoring Code 2020-05-24 12:32:03 +08:00
MysticBoy 5aeb4c0dfb modify cJSON.h 2020-05-24 11:44:36 +08:00
Jeff Tao b128febbdc
Merge pull request #1849 from haoyifan/timer_fix
[Timer] Initialize the last tmrCtrls.
2020-05-24 11:38:29 +08:00
Shengliang Guan 903ca108e0
Merge pull request #2016 from taosdata/enhance/sequence
Enhance/sequence
2020-05-24 10:54:29 +08:00
Jeff Tao 4187ae43ab compiling option 2020-05-23 14:59:11 +00:00
Jeff Tao 19bc76109b compliing opton for sync 2020-05-23 14:47:49 +00:00
MysticBoy 5d6d23ffbf Merge remote-tracking branch 'remotes/origin/develop' into feature/mqtt 2020-05-23 21:56:38 +08:00
Jeff Tao b9c08aff60 make more changes on vnodeMain.c 2020-05-23 13:54:36 +00:00
MysticBoy 400c1a8627 Implemented subscription json data from Mqtt broker! we subscription topic "/taos/+/+/+/" , format just like this '/taos/<token>/<db name>/<table name>/', next will add auth by token. 2020-05-23 21:54:12 +08:00
Jeff Tao 2a4fecebe6 tune the code to make the vnode cleanup process more clear 2020-05-23 13:39:44 +00:00
Haojun Liao afc8b5a3cd [td-225]refactor codes 2020-05-23 18:27:29 +08:00
Haojun Liao 5bc5563816 [td-225] 2020-05-23 18:12:51 +08:00
Shengliang Guan c733b76be4
Merge pull request #2013 from taosdata/patch/td-317
fix td-317: max table name length now is 392
2020-05-23 18:03:37 +08:00
Tao Liu df01a390d4 [TD-90] developing 2020-05-23 09:40:46 +00:00
Haojun Liao 4737c8cd44 [td-225] 2020-05-23 17:36:38 +08:00
Haojun Liao c44bf0ff17 [td-225] update the script 2020-05-23 17:36:19 +08:00
Haojun Liao c6cb40bf57 [td-225] fix bugs in tbname in query 2020-05-23 17:34:15 +08:00
Ping Xiao 3070277c56 Merge branch 'develop' into filterComboTest 2020-05-23 16:59:04 +08:00
MysticBoy 9e50edfe2e Receive subscription messages and query playload sql 2020-05-23 16:55:34 +08:00
MysticBoy f8ffd8cbfc add paho.mqtt.c for mqtt client 2020-05-23 16:52:39 +08:00
Haojun Liao e46896bfcd [td-225] support hex/bin numeric data to insert 2020-05-23 16:12:18 +08:00
Haojun Liao 7221f5a624 [td-227] 2020-05-23 16:10:44 +08:00
Shengliang Guan 61254bf30b Merge branch 'develop' of https://github.com/taosdata/TDengine into develop 2020-05-23 15:18:24 +08:00
Shengliang Guan 67c10e78ea scripts 2020-05-23 15:17:30 +08:00
Shengliang Guan 855bf501af
Merge pull request #2012 from taosdata/hotfix/taos-tools
Hotfix/taos tools
2020-05-23 15:12:43 +08:00
Shengliang Guan 0c21072851
Merge pull request #2011 from taosdata/hotfix/closeTcpSocket
tune the TCP socket code
2020-05-23 15:11:46 +08:00
Bomin Zhang 8bf4ef21fa fix td-317: max table name length now is 392 2020-05-23 15:00:22 +08:00