Commit Graph

3926 Commits

Author SHA1 Message Date
MysticBoy c89b2493a3 Merge remote-tracking branch 'remotes/origin/develop' into feature/mqtt 2020-05-26 23:42:29 +08:00
Shengliang Guan 9a29ebc532
Merge pull request #2039 from taosdata/hotfix/log
Hotfix/log
2020-05-26 23:14:06 +08:00
MysticBoy 957410a066 fix for topic and clean up 2020-05-26 18:18:12 +08:00
MysticBoy c2b148c16a rem mqttc install 2020-05-26 15:31:53 +08:00
MysticBoy a99005e0e8 fix for comparison of array 'tsMqttBrokerClientId' equal to a null pointer is
always false [-Werror,-Wtautological-pointer-compare]
  recnt_status.client_id = tsMqttBrokerClientId==NULL ||
2020-05-26 15:26:33 +08:00
MysticBoy f089b7c411 加入配置项说明和默认配置 2020-05-26 15:17:46 +08:00
MysticBoy adb6249aae Parse Uri , format is mqtt://username:password@hostname:1883/taos/ 2020-05-26 14:42:07 +08:00
MysticBoy b8a96b40b6 add MQTT-C 2020-05-26 11:50:23 +08:00
MysticBoy 2956b5861f remove old 2020-05-26 11:48:50 +08:00
MysticBoy f076073702 remove submodule 2020-05-26 11:43:14 +08:00
MysticBoy d0995506d9 Merge remote-tracking branch 'remotes/origin/develop' into feature/mqtt 2020-05-26 11:40:09 +08:00
Shengliang Guan 7c31b143b2
Merge pull request #2035 from taosdata/hotfix/sangshuduo/support-glibc-2.17-and-earlier-version
support glibc 2.17 (default version of CentOS7).
2020-05-26 09:47:28 +08:00
Shuduo Sang 5583060b00 support glibc 2.17 (default version of CentOS7).
[TD-420]
2020-05-25 22:37:54 +08:00
Shengliang Guan 2d146684b1
Merge pull request #2034 from taosdata/filterComboTest
Add more query cases
2020-05-25 22:08:40 +08:00
Ping Xiao daed646d4c Merge branch 'develop' into filterComboTest 2020-05-25 20:39:16 +08:00
Ping Xiao 47c63e89e6 1.Merge branch 'develop' into filterComboTest
2.Add query error cases
3.Add normal query cases
3.Add query cases with multiple filters
2020-05-25 20:37:43 +08:00
Shengliang Guan 1e3e40f6ea
Merge pull request #2033 from taosdata/feature/query
Feature/query
2020-05-25 19:36:54 +08:00
Haojun Liao 6f524d20ac [td-225]fix bugs in diff 2020-05-25 19:27:19 +08:00
Shengliang Guan 5cd9deda31
Merge pull request #2026 from sunguofeng/patch-1
Update TSDBDriver.java
2020-05-25 19:24:54 +08:00
Haojun Liao e1a34a1bf7 [td-225]fix bugs in fill for super table query 2020-05-25 19:13:15 +08:00
Shengliang Guan 2de739a1a9
Merge pull request #2029 from taosdata/feature/sangshuduo/sparse-file-compress-test
add insert/sparseData.py to test compressing sparse file content.
2020-05-25 19:01:34 +08:00
Shengliang Guan 5513e3a738
Merge pull request #2028 from taosdata/feature/td-407
TD-407: add config for binary column display width
2020-05-25 19:00:57 +08:00
Shengliang Guan e2d08c2751
Merge pull request #2032 from taosdata/develop_lihui
Develop lihui
2020-05-25 18:58:52 +08:00
Hui Li 41556c085b [modify script for arbitrator function] 2020-05-25 18:56:24 +08:00
Hui Li 316e807c51 [modify script for arbitrator function] 2020-05-25 18:46:14 +08:00
Bomin Zhang 4e3aa5d5d3 update shellPrintNChar
it padding the output to be exactly  `width` columns now.
2020-05-25 18:45:43 +08:00
sunguofeng d3aaceedb5
Update TSDBDriver.java
多数据源下,driver驱动根据acceptsURL判断url使用合适的驱动,增加判断TAOS驱动
2020-05-25 17:25:08 +08:00
Bomin Zhang 3a650da645 TD-407: add config for binary column display width 2020-05-25 17:19:22 +08:00
Shuduo Sang 9560f319b2 add insert/sparseData.py to test compressing sparse file content.
[TD-412]
2020-05-25 16:12:49 +08:00
slguan a2a8ada7c2 Merge branch 'develop' into hotfix/log
# Conflicts:
#	src/client/inc/tscLog.h
2020-05-25 14:57:58 +08:00
Shengliang Guan dfbe9ace8a
Merge pull request #2024 from taosdata/feature/query
Feature/query
2020-05-25 14:50:24 +08:00
Shengliang Guan 508dd0b409 scripts 2020-05-25 14:49:15 +08:00
Shengliang Guan 9dc99b3df7 [TD-410] not print local error msg 2020-05-25 13:59:08 +08:00
Shengliang Guan 374751dba5 [TD-410] fix log print error 2020-05-25 13:53:41 +08:00
Haojun Liao 0c4b90f3b4 [td-225] refactor codes 2020-05-25 11:51:50 +08:00
Haojun Liao 5447600648 [td-225] add statistics for binary/nchar data 2020-05-25 11:21:36 +08:00
Shengliang Guan 5ab5dcea68 Merge branch 'develop' of https://github.com/taosdata/TDengine into develop 2020-05-25 03:09:47 +00:00
Shengliang Guan 9c3ddab8c5 scripts 2020-05-25 03:04:51 +00:00
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
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