Commit Graph

9147 Commits

Author SHA1 Message Date
liuyq-617 7c6609e6c2 [TD-1750]<fix> add python2 connectionerror 2020-10-19 16:47:05 +08:00
Hui Li de2b0de6ee [NONE] 2020-10-19 16:46:41 +08:00
Hui Li cc74bdd8f8 [TD-1639] 2020-10-19 16:39:46 +08:00
Hui Li 90bdea4c5f Merge branch 'hotfix/test' of https://github.com/taosdata/TDengine into hotfix/test 2020-10-19 16:37:57 +08:00
Haojun Liao fb0456ca4c [td-1747] reduce tableMeta size 2020-10-19 16:26:28 +08:00
liuyq-617 fa7b5f047c <fix> add python connectionerror 2020-10-19 16:15:54 +08:00
Shengliang Guan 6fea1f4340
Merge pull request #3905 from taosdata/feature/os
TD-1743
2020-10-19 11:36:09 +08:00
Haojun Liao 3abaaabeee [td-225] 2020-10-19 11:33:49 +08:00
Shengliang Guan 006a832c7d Merge remote-tracking branch 'origin/develop' into feature/os 2020-10-19 03:22:10 +00:00
Shengliang Guan 4941318011
Merge pull request #3898 from taosdata/hotfix/td-1733
TD-1733
2020-10-19 10:59:28 +08:00
Shengliang Guan 068bb6c21c
Merge pull request #3903 from taosdata/hotfix/TD-1741
fix TD-1741
2020-10-19 10:59:07 +08:00
Shengliang Guan 0b3fb779c0 TD-1743 2020-10-19 02:48:16 +00:00
Shengliang Guan 05ee7d7b4c
Merge pull request #3902 from taosdata/feature/os
[TD-1743]<fix>: When deleting a database, tables in other databases may be deleted by mistake
2020-10-19 10:44:16 +08:00
Shengliang Guan e5633b6ad3 TD-1743 When deleting a database, tables in other databases may be deleted by mistake 2020-10-19 02:23:24 +00:00
Haojun Liao 40c7208cc2 [td-225] 2020-10-19 09:53:20 +08:00
Hongze Cheng e1f52dacb1 fix TD-1741 2020-10-18 23:19:03 +08:00
freemine 196106ade5 reenable jdbc 2020-10-18 20:26:14 +08:00
freemine 4d7a69d190 1. support fraction in timestamp
2. trying to use tsdb_xxx_to_yyy
2020-10-18 20:22:47 +08:00
Haojun Liao b3165d4193 [td-225] 2020-10-18 15:38:18 +08:00
freemine b0ff31e1a2 remove obsolete code 2020-10-18 14:18:15 +08:00
freemine a1a43cede0 Merge remote-tracking branch 'upstream/develop' into odbc 2020-10-18 14:03:53 +08:00
yihaoDeng 91782c5b99 TD-1733 2020-10-18 01:04:17 +00:00
freemine 1e3e85c0da Merge branch 'namedtype' of github.com:freemine/TDengine into namedtype 2020-10-18 06:07:37 +08:00
freemine b3f67174dc Merge remote-tracking branch 'upstream/develop' into namedtype 2020-10-18 04:59:38 +08:00
Haojun Liao 1e8461e66c [td-225] 2020-10-18 02:24:29 +08:00
Haojun Liao a0a274e8ba [td-225] 2020-10-18 02:16:36 +08:00
Haojun Liao 134d1f6434 [td-225] 2020-10-18 02:03:10 +08:00
Haojun Liao 5df7a81160 [td-225] 2020-10-18 01:14:01 +08:00
Haojun Liao 5adcf14d6e [td-225] 2020-10-18 00:45:49 +08:00
Haojun Liao adcbb0fe40 [td-225] 2020-10-18 00:23:19 +08:00
Haojun Liao 95adf3ea61 [td-225] 2020-10-17 23:47:40 +08:00
Shengliang Guan 95aa2442e1
Merge pull request #3896 from taosdata/hotfix/test
[TD-1631]
2020-10-17 22:38:34 +08:00
Haojun Liao d069a35683 [td-225] add more info in log. 2020-10-17 22:38:07 +08:00
Shengliang Guan 4bf931fc5d
Merge pull request #3895 from taosdata/feature/os
Feature/os
2020-10-17 17:13:53 +08:00
Haojun Liao a87717bb7d [td-225] 2020-10-17 16:35:12 +08:00
plum-lihui d28a8a7e7e [TD-1631] 2020-10-17 16:25:15 +08:00
plum-lihui a9611c9bfe [TD-1631] 2020-10-17 16:21:33 +08:00
Shengliang Guan 64b75f55a7 compile error in vs2013 2020-10-17 16:16:28 +08:00
haojun Liao ab96870bd8
Merge branch 'develop' into namedtype 2020-10-17 13:44:08 +08:00
Shengliang Guan 5f55bf251e Merge from develop 2020-10-17 13:37:19 +08:00
Shengliang Guan a0fe1d3c34
Merge pull request #3893 from taosdata/feature/query
Feature/query
2020-10-17 13:29:22 +08:00
Shengliang Guan a68e772b5e TD-1530 invalid read while execute interp.sim 2020-10-17 13:17:15 +08:00
Haojun Liao d4ad59df86 [td-1720] 2020-10-17 13:05:17 +08:00
Haojun Liao 513eb4d7eb [td-225] 2020-10-17 13:03:59 +08:00
Haojun Liao e7fb3fdc53 [td-225] refactor codes. 2020-10-17 13:02:19 +08:00
Shengliang Guan 5acc9c2873
Merge pull request #3891 from taosdata/bugfix/td-1709
[TD-1709]<fix>: stream crash in cluster
2020-10-17 11:42:28 +08:00
Bomin Zhang a9e5591292 fix TD-1709 2020-10-17 10:26:49 +08:00
freemine 273b8e1732 msvc: C4244 2020-10-17 07:37:21 +08:00
freemine 964729a9fd msvc: C4244 2020-10-17 07:17:45 +08:00
freemine a6c918bf42 1. msvc: C4244, conversion-loss-of-data
2. msvc: C4477, "%ld" => "%" PRId64 ""
2020-10-17 06:50:28 +08:00