Commit Graph

798 Commits

Author SHA1 Message Date
dapan1121 17f2d3fb5a
Merge pull request #7273 from taosdata/feature/TD-5797
[TD-5797]<feature> support multi distinct
2021-08-15 06:41:30 +08:00
shenglian-zhou 2efda1271d
Merge branch 'develop' into hotfix/td-5931 2021-08-13 08:36:21 +08:00
yihaoDeng 90aba21f27 [TD-5797]<fix> merge develop 2021-08-12 20:24:25 +00:00
Shengliang Guan 56885b7645 merge from develop 2021-08-12 10:17:23 +08:00
Shengliang Guan fa871f521f Merge remote-tracking branch 'origin/master' into feature/d1 2021-08-12 10:15:15 +08:00
wpan 9dab2ac93b add test case 2021-08-10 17:17:55 +08:00
shenglian zhou e5ceaa2a90 [TD-5931]<fix>:invalidate time range when no tables after trimTableGroup 2021-08-10 14:37:19 +08:00
Shengliang Guan adb5b0f927 Merge from master 2021-08-09 10:19:17 +08:00
wpan 28692a51cc Merge branch 'develop' into feature/TD-2581 2021-08-09 09:23:12 +08:00
wpan b13780f15c add test case 2021-08-09 08:23:15 +08:00
yihaoDeng c68ae361b2 [TD-5799]<test> self test distinct 2021-08-08 04:16:18 +08:00
Xin.Zh 7c173acc55
add license header (#7197) 2021-08-05 19:33:40 +08:00
Shengliang Guan b6efe1c46a Merge from develop 2021-08-04 12:20:41 +08:00
Hui Li 0755cb29c4
Merge pull request #7129 from taosdata/test/remove_now_timestamp
[TD-5662]<test>remove now and duplicate sim case
2021-08-04 08:31:07 +08:00
Shengliang Guan 9b12556314 Merge remote-tracking branch 'origin/develop' into feature/m2d7 2021-08-03 17:13:37 +08:00
liuyq-617 ae25f4076a [TD-5662]<test>remove now and duplicate sim case 2021-08-03 11:46:41 +08:00
wpan 079e063b59 add test case 2021-08-03 10:51:20 +08:00
Shengliang Guan c13c0f5727 merge from develop 2021-08-02 18:03:29 +08:00
Haojun Liao c1650bd06f
Merge pull request #7060 from taosdata/hotfix/td-5594
[TD-5594]<fix>:calculate tag index in table meta when modify tag type
2021-08-02 17:01:36 +08:00
wpan 8ba2d65287 Merge branch 'feature/TD-2581' of github.com:taosdata/TDengine into feature/TD-2581 2021-08-02 14:16:46 +08:00
wpan 1643b5e4c6 fix bug and case issue 2021-08-02 14:16:17 +08:00
dapan 6ec4bac439 Merge branch 'develop' into feature/TD-2581 2021-08-02 08:13:33 +08:00
Haojun Liao a849451703
Merge branch 'develop' into feature/query 2021-07-30 16:30:49 +08:00
Haojun Liao 6f4257aa9a
Merge pull request #7049 from taosdata/fix/TD-5534
[TD-5534]<fix>:fix the coverity high risk of client&query
2021-07-30 16:26:54 +08:00
wangmm0220 5f37d8a2a5 [TD-5534]<fix>:fix test case out of date error 2021-07-30 11:27:34 +08:00
wpan ca985ec7c6 fix interp bug 2021-07-30 10:38:15 +08:00
Haojun Liao c7ae4f5789 [td-5600]<fix>: fix fill caused crashed in join query. 2021-07-29 10:47:09 +08:00
shenglian zhou bb2b2ec9f4 [TD-5594]<fix>:calculate tag index in table meta when modify tag type 2021-07-29 07:43:48 +08:00
wpan 83d1283390 fix bug and case issue 2021-07-27 18:17:14 +08:00
wpan e9f664f922 Merge branch 'develop' into feature/TD-2581 2021-07-27 11:32:36 +08:00
tickduan 4833f5eaa3 metrics_del.sim 23:50 insert two days bug fixed 2021-07-27 10:22:29 +08:00
wpan 82a7d7b9e3 add test case 2021-07-26 09:55:50 +08:00
wpan cfa925dd17 support range filter 2021-07-26 09:54:24 +08:00
wpan 8ed28fd81a support range filter 2021-07-23 18:32:35 +08:00
wpan e270cf3742 code refact 2021-07-21 17:56:44 +08:00
tickduan c71d9050e9 trigger PR build 2021-07-21 09:33:21 +08:00
tickduan 234aad8ee7 db name len and metrics_del.sim two problem fixed 2021-07-20 21:07:13 +08:00
shenglian zhou 3b86cd1242 Merge branch 'develop' into feature/td-4647-2 2021-07-19 20:13:35 +08:00
Haojun Liao e3046f62f6 [td-225]merge develop. 2021-07-16 22:35:06 +08:00
shenglian zhou f79e53e36d fix tstrerror code 2021-07-16 22:28:47 +08:00
Haojun Liao 23faaf75bd
Merge pull request #6771 from taosdata/feature/cenc
Feature/cenc
2021-07-16 22:21:42 +08:00
wpan d5a8aedb34 refact code 2021-07-16 14:24:12 +08:00
Haojun Liao 0b05f0b06d [td-5190]<fix>: add test cases. 2021-07-16 12:56:19 +08:00
Haojun Liao 2d6ad4d87b
Merge pull request #6825 from taosdata/fix/TD-5134
[TD-5134]<fix> fix runtime error
2021-07-16 10:30:16 +08:00
shenglian zhou 83a66e1e33 Merge branch 'develop' into feature/td-4647-2 2021-07-16 09:40:27 +08:00
wpan 375847cad6 support nchar filter 2021-07-16 08:13:06 +08:00
Haojun Liao dbaaee3365 [td-225]merge develop. 2021-07-16 10:20:42 +08:00
wpan 8756467972 support nchar filter in parent 2021-07-15 16:11:21 +08:00
Haojun Liao b8e8046716
Merge pull request #6857 from taosdata/feature/TD-5169
[TD-5169]<fix>: fixed a potential crash bug
2021-07-15 15:29:20 +08:00
wpan 31d17bdecc Merge branch 'develop' into feature/TD-2581 2021-07-15 14:27:51 +08:00