Commit Graph

8759 Commits

Author SHA1 Message Date
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
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
Shengliang Guan 95aa2442e1
Merge pull request #3896 from taosdata/hotfix/test
[TD-1631]
2020-10-17 22:38:34 +08:00
Shengliang Guan 4bf931fc5d
Merge pull request #3895 from taosdata/feature/os
Feature/os
2020-10-17 17:13:53 +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
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
freemine 1df2739281 Merge remote-tracking branch 'upstream/develop' into odbc 2020-10-17 06:25:25 +08:00
freemine 2436485e9b test case: with user-provided type other than table field type 2020-10-17 06:25:17 +08:00
freemine 1c52e6598e 1. add batch-insert
2. allow buffer-type conversion within taos
2020-10-17 06:11:21 +08:00
Haojun Liao 15b2e41d7a [td-1720] 2020-10-16 23:22:42 +08:00
Haojun Liao adb8b05129 Merge branch 'feature/query' of https://github.com/taosdata/TDengine into feature/query 2020-10-16 23:05:16 +08:00
Haojun Liao 59abdffcd7 [td-1720] 2020-10-16 23:01:02 +08:00
Haojun Liao ab3133f808 [td-1712] 2020-10-16 22:59:14 +08:00
Shengliang Guan b4472552e6
Merge pull request #3886 from taosdata/feature/os
Feature/os
2020-10-16 22:12:36 +08:00
Shengliang Guan 9c9593d58c scripts 2020-10-16 13:59:00 +00:00
Shengliang Guan 51c09bb1ed TD-1530 aligin double in arm32 2020-10-16 18:56:15 +08:00
Shengliang Guan 1ad7827fc1 TD-1530 2020-10-16 18:47:02 +08:00
Shengliang Guan 68c5947a33
Merge pull request #3885 from taosdata/hotfix/test
<test> fix jenkins error
2020-10-16 18:14:14 +08:00
Shengliang Guan a04dff125b Merge branch 'feature/os' of https://github.com/taosdata/TDengine into feature/os 2020-10-16 17:53:21 +08:00
Shengliang Guan 2490995d6c TD-1530 fix invalid read/write while execute tags_filter.sim 2020-10-16 09:52:49 +00:00
liuyq-617 e47d694bef <test> fix jenkins error 2020-10-16 16:33:45 +08:00
Shengliang Guan bbbb87ccb9 Merge remote-tracking branch 'origin/develop' into feature/query 2020-10-16 16:03:27 +08:00
Shengliang Guan 1d6a57209d
Merge pull request #3883 from taosdata/feature/crash
Feature/crash
2020-10-16 16:01:36 +08:00
Haojun Liao 752844b1e0 [td-1728] fix memory leaks 2020-10-16 15:10:13 +08:00
Shengliang Guan 8385237ced Merge remote-tracking branch 'origin/develop' into feature/crash 2020-10-16 14:30:20 +08:00
Shengliang Guan 0bb3794b2d TD-1725 2020-10-16 14:29:25 +08:00
Shengliang Guan 8714b05ea1
Merge pull request #3881 from taosdata/hotfix/TD-1705
Hotfix/td 1705
2020-10-16 14:07:24 +08:00
yihaoDeng bca09e93e3 TD-1705 2020-10-16 05:18:59 +00:00
Shengliang Guan b1cc403da1 TD-1725 2020-10-15 18:23:28 +08:00
Shengliang Guan d0935c02f6
Merge pull request #3862 from taosdata/bugfix/TD-1706
[TD-1706]<fix>: leak of connection id
2020-10-15 15:05:44 +08:00
Shengliang Guan 3fa5fa3fd6
Merge pull request #3870 from taosdata/feature/os
compiled error in wn32
2020-10-15 14:01:50 +08:00
Shengliang Guan efec15d267 compiled error in wn32 2020-10-15 13:59:08 +08:00
Shengliang Guan e94b5f1f2f
Merge pull request #3861 from taosdata/feature/sync
[TD-1652]: Possible loss of data when the synchronization state is switched
2020-10-15 13:25:28 +08:00
Shengliang Guan e9c4a8a8b5
Merge pull request #3868 from taosdata/feature/query
Feature/query
2020-10-15 13:07:06 +08:00
Shengliang Guan df051e640d
Merge branch 'develop' into feature/query 2020-10-15 12:13:49 +08:00
Shengliang Guan abcc9c7267
Merge pull request #3867 from taosdata/hotfix/test
[TD-1676]balance jenkins server
2020-10-15 12:11:30 +08:00