Commit Graph

5317 Commits

Author SHA1 Message Date
Shengliang Guan 6b3dcdda9c TD-1453 2020-09-22 11:42:50 +08:00
Shengliang Guan 35dab9a437
Merge pull request #3619 from taosdata/hotfix/TD-1521
fix bug TD-1521
2020-09-22 09:27:58 +08:00
yihaoDeng ba968b813c fix bug TD-1521 2020-09-21 13:42:48 +00:00
Bomin Zhang 3e89b203ae
Merge branch 'develop' into feature/query 2020-09-21 17:50:22 +08:00
Bomin Zhang 6e3d63727b use cache in subscribe & prepare 2020-09-21 16:24:12 +08:00
Haojun Liao d8a9ead27a [td-225] fix bugs in regression test. 2020-09-21 16:06:55 +08:00
Haojun Liao f91fccd82e [td-225] fix bugs in regression test. 2020-09-21 15:41:29 +08:00
Haojun Liao a8bd8db943 Merge branch 'develop' into feature/query 2020-09-21 15:24:00 +08:00
Haojun Liao 47d974994c [td-225] fix bugs in regression test. 2020-09-21 15:23:17 +08:00
Haojun Liao f982f2df5e [td-225] fix bugs in regression test. 2020-09-21 15:17:27 +08:00
Shengliang Guan 641265898a Merge branch 'feature/http' into release/s102 2020-09-21 14:14:54 +08:00
Shengliang Guan 68388b5634 Merge from release/s102 2020-09-21 05:21:34 +00:00
haojun Liao f0db62241c
Merge pull request #3598 from taosdata/feature/query
[td-225] fix bugs in regression test.
2020-09-21 13:21:22 +08:00
Haojun Liao ad1c82b6db [td-225] fix bugs in regression test. 2020-09-21 13:20:23 +08:00
haojun Liao c84c9d46c9
Merge pull request #3597 from taosdata/feature/query
[td-225] fix bugs in regression test.
2020-09-21 12:55:53 +08:00
Haojun Liao fbc4ebb915 [td-225] fix bugs in regression test. 2020-09-21 12:53:11 +08:00
Shengliang Guan 1a5272a49f TD-1520 2020-09-21 04:34:29 +00:00
Shengliang Guan e589dc241d
Merge pull request #3594 from taosdata/bugfix/stream
[TD-1529]<fix>: CQ create db connection async
2020-09-21 12:25:36 +08:00
haojun Liao 76cef9f361
Merge pull request #3595 from taosdata/feature/query
[td-225] fix bugs in regression test.
2020-09-21 12:11:27 +08:00
Bomin Zhang d5f21eda17 TD-1529: stream async create db connection
and also fix failed test cases related to stream.
2020-09-21 12:05:29 +08:00
Shengliang Guan fad472bc9a
Merge pull request #3593 from taosdata/feature/query
[td-225] fix bugs in regression test.
2020-09-21 12:02:26 +08:00
Bomin Zhang 1f73c106b9 TD-1529: stream async create db connection
and also fix failed test cases related to stream.
2020-09-21 11:56:33 +08:00
Haojun Liao 77b86280fd [td-225] fix bugs in regression test. 2020-09-21 11:45:31 +08:00
Shengliang Guan 43d14affc6 Merge remote-tracking branch 'origin/develop' into feature/http 2020-09-20 09:19:41 +00:00
Shengliang Guan 347a45e24f minor changes 2020-09-18 10:53:58 +08:00
Haojun Liao 2d62f18294 Merge branch 'develop' into feature/query 2020-09-18 10:42:36 +08:00
Shengliang Guan 77048d5ad2 Merge from develop into feature/http 2020-09-18 10:18:58 +08:00
Shengliang Guan b76c6d6e7c TD-1520 2020-09-18 02:15:31 +00:00
Shengliang Guan 66894a8b05 Merge branch 'develop' of https://github.com/taosdata/TDengine into develop 2020-09-18 02:06:03 +00:00
Haojun Liao 079cd0e010 [td-225] fix a memory leak in query. 2020-09-17 21:46:28 +08:00
Bomin Zhang 28ac9104b0 td-1245: fix failed cast 'lastrow.sim' 2020-09-17 17:19:57 +08:00
Shengliang Guan 2f1264917b
Merge pull request #3556 from taosdata/feature/query
Feature/query
2020-09-17 17:10:03 +08:00
Shengliang Guan 1ddb252fc8 minor changes 2020-09-17 09:00:49 +00:00
Haojun Liao bd725f1b53 [td-225] fix compiler error on win 2020-09-17 16:48:06 +08:00
Haojun Liao 0655f427d3 [td-225] fix compiler error on win 2020-09-17 16:46:57 +08:00
Shengliang Guan 9976af09e3
Merge pull request #3568 from taosdata/feature/http
[TD-1450]<fix>: change maxSqlLength from 8M to 1M
2020-09-17 16:41:00 +08:00
Haojun Liao e7fa1ad0b3 [td-1478] 2020-09-17 16:34:43 +08:00
Haojun Liao 4f83e11354 [td-1483] 2020-09-17 16:33:40 +08:00
Shengliang Guan ce7a3623fb TD-1450 change maxSqlLength from 8M to 1M 2020-09-17 08:14:08 +00:00
Shengliang Guan 5c369d2c9f
Merge pull request #3565 from taosdata/feature/http
memory leak in restful while close context
2020-09-17 15:49:46 +08:00
Shengliang Guan c9e1f79317 git commit -m 'memory leak in restful while close context' 2020-09-17 07:07:27 +00:00
zyyang 804045682c solve conflict 2020-09-17 14:06:39 +08:00
zyyang 21a03f05fc merge develop's code 2020-09-17 13:52:20 +08:00
zyyang e406aedbb4 clean unused codes 2020-09-17 13:32:12 +08:00
Shengliang Guan 1741508f4f Meger from develop into feature/query 2020-09-17 12:57:07 +08:00
Shengliang Guan 2d6f6afc17 compile in windows 2020-09-17 12:14:34 +08:00
Shengliang Guan 0eaffe9032 Merge remote-tracking branch 'origin/develop' into feature/td-1245 2020-09-17 12:11:07 +08:00
Shengliang Guan 3d550c1a3c
Merge pull request #3559 from taosdata/develop
Merge from develop into feature/td-1245
2020-09-17 11:46:47 +08:00
Shengliang Guan f44eea86f7
Merge pull request #3558 from taosdata/develop
Merge from develop into feature/query
2020-09-17 11:44:48 +08:00
Shengliang Guan cff2e7c48b Merge remote-tracking branch 'origin/develop' into hotfix/sangshuduo/fix-compile-error-for-release 2020-09-17 03:42:15 +00:00