Commit Graph

18413 Commits

Author SHA1 Message Date
Haojun Liao a66e65b724 [td-255] merge develop 2021-08-26 10:57:19 +08:00
Zhiyu Yang 7c76e85979
change (#7572) 2021-08-26 10:02:29 +08:00
Shengliang Guan fbc40c2900
Merge pull request #7579 from taosdata/feature/d1
merge from master into develop
2021-08-26 09:16:27 +08:00
dapan1121 976fbda9d6
Merge pull request #7558 from taosdata/fix/TD-6308
[TD-6308]<fix> partial loaded table meta cause unexpected result
2021-08-26 08:34:13 +08:00
dapan1121 41939f1174
Merge pull request #7552 from taosdata/hotfix/TD-5466
[TD-5466]<fix> handle invalid Escapes
2021-08-26 08:30:55 +08:00
Elias Soong faf12f31e0
Merge pull request #7594 from taosdata/docs/Update-Latest-Feature
[TD-6255] <docs>: fix url link typo in Java doc.
2021-08-25 20:42:37 +08:00
Elias Soong a7308f4b83 [TD-6255] <docs>: fix url link typo in Java doc. 2021-08-25 20:42:15 +08:00
Elias Soong 8f6acdfe22
Merge pull request #7593 from taosdata/docs/Update-Latest-Feature
[TD-6255] <docs>: fix MarkDown format in Java doc.
2021-08-25 20:31:59 +08:00
Elias Soong 8a687271be [TD-6255] <docs>: fix MarkDown format in Java doc. 2021-08-25 20:31:34 +08:00
Haojun Liao b822d971cc [td-255] fix invalid free error. 2021-08-25 20:24:43 +08:00
dapan1121 3cdde17a00
Merge pull request #7578 from taosdata/hotfix/TD-6317
[TD-6317]<fix> fix test case
2021-08-25 18:01:13 +08:00
Haojun Liao d2c2010053 [td-255] fix compiler error. 2021-08-25 16:57:06 +08:00
Hui Li 97612437b5
Merge pull request #7561 from taosdata/xiaoping/add_test_case
[TD-6295][ci skip]<test>: Update performace test script for perfMonitor
2021-08-25 16:41:42 +08:00
Shengliang Guan be358f8fbf Merge remote-tracking branch 'origin/master' into feature/d1 2021-08-25 16:17:14 +08:00
Shengliang Guan d04dd4644f Merge remote-tracking branch 'origin/develop' into feature/d1 2021-08-25 16:17:07 +08:00
Shengliang Guan 349d565d33 merge from master 2021-08-25 16:17:02 +08:00
dapan1121 93f5ff2e0b
Merge pull request #7567 from taosdata/hotfix/TD-6315
[td-6315]fix group by tag+having in nested query issue
2021-08-25 15:27:48 +08:00
Shuduo Sang f538895398
Hotfix/sangshuduo/td 5875 taosdemo ue improve for master (#7574)
* better msg for create child table.

* just add one new line.
2021-08-25 15:11:53 +08:00
Haojun Liao 77a920d278
Merge pull request #7437 from taosdata/fix/ZhiqiangWang/TD-6169-windows-dll-client-can-not-quit-problem
[DONT MERGE] [TD-6169]<fix>: windows dll client can not quit.
2021-08-25 14:27:39 +08:00
Haojun Liao 10b3e4d85a [td-255] fix compiler error. 2021-08-25 14:25:01 +08:00
Zhiyu Yang a77f824262
[TD-6004]<feature>: JDBC-RSETful support specify dbname in http url (#7573) 2021-08-25 14:07:52 +08:00
Haojun Liao 7870763277 [td-255] merge develop 2021-08-25 14:01:21 +08:00
Haojun Liao a3a274d0c1 [td-255] refactor 2021-08-25 14:01:02 +08:00
Shengliang Guan 0899e5e53c Merge remote-tracking branch 'origin/develop' into feature/d1 2021-08-25 13:57:30 +08:00
Haojun Liao fa72b565a9 [td-255] merge develop 2021-08-25 13:56:13 +08:00
Shengliang Guan 935a758435 merge from master 2021-08-25 13:24:44 +08:00
Hongze Cheng 7488976b6a
Merge pull request #7548 from taosdata/hotfix/TD-6311
fix: fix coredump for last_row query when last row is cached
2021-08-25 13:23:35 +08:00
Hongze Cheng 459eb33113
Merge pull request #7549 from taosdata/hotfix/TD-6311-master
[TD-6311]<hotfix>: fix coredump for last_row query when cache_last_row
2021-08-25 13:21:21 +08:00
Haojun Liao 9183a6578b [td-6260]fix compiler error. 2021-08-25 13:02:21 +08:00
yihaoDeng 8da97ddfbb [TD-6317]<fix> fix test case 2021-08-25 12:42:36 +08:00
yihaoDeng 6404918698 merge develop 2021-08-25 12:28:33 +08:00
Shuduo Sang 697ff6aee2
[TD-6274]<fix>: taos shell --file bug. (#7570) 2021-08-25 12:23:21 +08:00
yihaoDeng 09872ff39a merge develop 2021-08-25 12:16:50 +08:00
Shengliang Guan aff4adf71c Merge from master 2021-08-25 11:51:48 +08:00
Elias Soong 8058f91f31
Merge pull request #7575 from taosdata/docs/Update-Latest-Feature
[TD-2639] <docs>: update description about operator "like".
2021-08-25 11:37:34 +08:00
Elias Soong 5584038709 [TD-2639] <docs>: update description about operator "like". 2021-08-25 11:37:09 +08:00
Shuduo Sang ceeb22d667
better msg for create child table. (#7565) 2021-08-25 10:38:52 +08:00
yihaoDeng 00b7633878 [TD-6308]<fix> partial loaded table meta cause unexpected result 2021-08-25 10:07:52 +08:00
dapan1121 72f38c33cd
Merge pull request #7546 from taosdata/fix/TD-6296
[TD-6296]<fix>:When the timestamp column is filtered using the or field, the error content is abnormal
2021-08-25 09:52:01 +08:00
dapan1121 15362557e6
Merge pull request #7537 from taosdata/feature/TD-5838-master
Feature/td 5838 master
2021-08-25 09:51:28 +08:00
dapan1121 dcc7563105
Merge pull request #7559 from taosdata/fix/TD-6317
[TD-6317]<fix> forbidden distinct with order by
2021-08-25 09:50:45 +08:00
wpan 059708c876 fix group by tag+having issue 2021-08-25 09:44:07 +08:00
Ping Xiao 993b4a0185 [TD-6295][ci skip]<test>: Update performace test script for perfMonitor 2021-08-25 09:31:39 +08:00
yihaoDeng 290008553c [TD-5466]<fix> handle invalid Escapes 2021-08-25 09:15:05 +08:00
Shengliang Guan 3561eff87a
Merge pull request #7453 from taosdata/feature/d1
merge from master into develop
2021-08-25 09:11:58 +08:00
Shengliang Guan ae2739b1cf
Merge pull request #7557 from taosdata/feature/m1
Feature/m1
2021-08-25 09:11:35 +08:00
Shuduo Sang 3d06d17b53
Feature/sangshuduo/td 5875 taosdemo ue improve (#7560)
* [TD-5875]<featur>: taosdemo show progress

* empty commit for CI

* better msg for create child table.
2021-08-25 08:15:05 +08:00
yihaoDeng 87d54c1765 [TD-6317]<fix> forbidden distinct with order by 2021-08-25 08:05:58 +08:00
Elias Soong 46b9c174a2
Merge pull request #7563 from taosdata/docs/Update-Latest-Feature
[TS-106] <docs>: describe the difference of timezone setting between …
2021-08-24 22:43:02 +08:00
Elias Soong 36c2980092 [TS-106] <docs>: describe the difference of timezone setting between Win & Linux. 2021-08-24 22:42:40 +08:00