Commit Graph

10248 Commits

Author SHA1 Message Date
Shengliang Guan b07924deec Merge remote-tracking branch 'origin/develop' into feature/wal 2020-11-20 17:18:16 +08:00
Shengliang Guan 66c6e5ba05 change sync log 2020-11-20 16:51:16 +08:00
Shengliang Guan ffed44831f
Merge pull request #4304 from taosdata/feature/wal
TD-2046
2020-11-20 16:02:40 +08:00
Shengliang Guan 7749987f53 compile error 2020-11-20 15:40:10 +08:00
Shengliang Guan 875cd69000 TD-2046 2020-11-20 15:39:00 +08:00
Shengliang Guan f575d942a2 change log format 2020-11-20 15:12:56 +08:00
haojun Liao d4455d1ec3
Merge pull request #4302 from taosdata/feature/query
Feature/query
2020-11-20 14:39:51 +08:00
Shengliang Guan 007af68057 TD-2046 2020-11-20 14:35:27 +08:00
Haojun Liao cb48999898 [TD-225] add test cases. 2020-11-20 14:12:23 +08:00
Shengliang Guan ea3aae750e
Merge pull request #4298 from taosdata/feature/wal
Feature/wal
2020-11-20 14:09:32 +08:00
Haojun Liao 5f6ea86895 [TD-2152] 2020-11-20 14:04:05 +08:00
Shengliang Guan 84c1bac54a
Merge pull request #4296 from taosdata/xiaoping/add_test_case2
[TD-1355] <test> add test case, fix queryInterval
2020-11-20 13:57:41 +08:00
Haojun Liao dec06d7c23 [TD-2152]<fix>: fix the bug that failed to check the invalid column during join query in order by clause. 2020-11-20 13:56:33 +08:00
Shengliang Guan f323186f78 TD-2046 2020-11-20 13:48:05 +08:00
haojun Liao 63fc211e96
Merge pull request #4301 from taosdata/feature/query
Feature/query
2020-11-20 12:51:05 +08:00
Shengliang Guan 566b749cc5 TD-2046 2020-11-20 12:32:42 +08:00
Haojun Liao b24b305924 [TD-225]update the sim. 2020-11-20 12:05:04 +08:00
Haojun Liao b2cbf6eb4a Merge remote-tracking branch 'origin/feature/query' into feature/query 2020-11-20 12:00:06 +08:00
Haojun Liao 5c06bd53a6 [TD-225] 2020-11-20 11:58:26 +08:00
haojun Liao cfac2af4fd
Merge pull request #4295 from taosdata/feature/query
Feature/query
2020-11-20 11:49:00 +08:00
Shengliang Guan edbca45864
Merge branch 'develop' into feature/query 2020-11-20 11:22:35 +08:00
Shengliang Guan 73ff87d682
Merge pull request #4299 from taosdata/release/s106
Release/s106
2020-11-20 11:21:44 +08:00
haojun Liao 95f67a0030
Merge branch 'develop' into feature/query 2020-11-20 11:00:44 +08:00
Haojun Liao c0ea91ef53 [TD-2090] 2020-11-20 10:59:15 +08:00
Jeff Tao a8b87ce0cd change applications 2020-11-20 01:07:33 +00:00
Haojun Liao d7e8b4c184 [TD-225] refactor codes. 2020-11-19 23:08:25 +08:00
Haojun Liao 3afd7a65a7 [TD-2145]<fix>: fix bugs in interval query. 2020-11-19 22:34:07 +08:00
Haojun Liao 82246d441d [TD-1765] add test cases. 2020-11-19 18:42:38 +08:00
Haojun Liao d4cd364f9e [TD-1765]<fix>: fix bugs in percentile query during group by normal columns. 2020-11-19 18:37:11 +08:00
Shengliang Guan 976d8653bb TD-2153 2020-11-19 09:57:57 +00:00
Shengliang Guan b09445a35b Merge remote-tracking branch 'origin/release/s106' into feature/wal 2020-11-19 09:57:34 +00:00
haojun Liao c4c9c39dc4
Merge pull request #4294 from taosdata/feature/query
Feature/query
2020-11-19 17:54:56 +08:00
Ping Xiao 3b6b05691f [TD-1355] <test> add test case, fix queryInterval 2020-11-19 17:54:27 +08:00
Shengliang Guan 5029e7da3f TD-2153 2020-11-19 09:53:34 +00:00
Haojun Liao bc41fa4ae8 [TD-225] 2020-11-19 17:49:05 +08:00
Shengliang Guan a82d594a81 TD-2157 2020-11-19 09:48:48 +00:00
Haojun Liao 5d09399ee9 [TD-2159] 2020-11-19 17:46:12 +08:00
Haojun Liao 63c3ae84b8 [TD-2159] add test cases. 2020-11-19 17:23:18 +08:00
Haojun Liao 4a7fc101a0 [TD-2159] 2020-11-19 17:18:18 +08:00
Haojun Liao ec8c6d0c16 [TD-2159]<fix>: fix bugs in limit/offset in group by normal columns. 2020-11-19 16:54:26 +08:00
Shengliang Guan 2171bf7a15 TD-2157 2020-11-19 08:39:16 +00:00
Haojun Liao 2ae05f8daa [TD-2144] 2020-11-19 16:24:11 +08:00
huili 9b147cbd81
Merge pull request #4292 from taosdata/hotfix/test
[temp not compile odbc]
2020-11-19 15:50:46 +08:00
Hui Li 727ed76d00 [temp not compile odbc] 2020-11-19 15:49:39 +08:00
huili abd34e7a28
Merge pull request #4291 from taosdata/hotfix/TD-2156
change packaging scripts
2020-11-19 15:47:02 +08:00
plum-lihui cd6bb16a0b change packaging scripts 2020-11-19 15:44:29 +08:00
plum-lihui da5b584eab Merge branch 'release/s106' of https://github.com/taosdata/TDengine into release/s106 2020-11-19 15:32:22 +08:00
plum-lihui c3199e6f79 [TD-2156]<hotfix>: change packaging tool 2020-11-19 15:31:40 +08:00
haojun Liao 143e60111e
Merge pull request #4290 from taosdata/feature/query
Feature/query
2020-11-19 15:15:43 +08:00
Haojun Liao 1e1e947310 [TD-225] 2020-11-19 15:12:18 +08:00