Commit Graph

16101 Commits

Author SHA1 Message Date
Haojun Liao e6072702eb [td-4529] update log and merge develop. 2021-06-04 12:47:57 +08:00
Haojun Liao 32441c84bb Merge branch 'develop' into feature/query 2021-06-04 11:53:10 +08:00
Haojun Liao c85123df36 Merge remote-tracking branch 'origin/feature/query' into feature/query 2021-06-04 11:50:15 +08:00
Haojun Liao b0281578d5 [td-4529] diff support super table query. 2021-06-04 11:49:56 +08:00
lichuang 864b0d2792 Merge branch 'feature/TD-3963' of github.com:taosdata/TDengine into feature/TD-3963 2021-06-04 11:23:19 +08:00
lichuang e81c7324db [TD-3963]fix cache_last_row bug 2021-06-04 11:23:01 +08:00
haojun Liao ecbc610839
Merge pull request #6348 from taosdata/feature/query
Feature/query
2021-06-04 10:37:37 +08:00
Minglei Jin e4c10a3e24 test/offlineThreshold: fix index in show variables; 2021-06-04 10:24:56 +08:00
tomchon 2ff6b5166b Merge branch 'develop' of github.com:taosdata/TDengine into dev/chr 2021-06-04 10:22:30 +08:00
lichuang 97b0ca05e4 Merge branch 'develop' into feature/TD-3963 2021-06-04 10:11:24 +08:00
Shengliang Guan ae6cc0b73b
Merge pull request #6369 from taosdata/feature/m2d2
merge from master
2021-06-04 10:06:17 +08:00
yihaoDeng fc2688d543 [TD-4426]<feature> merge in 2021-06-04 07:43:59 +08:00
haojun Liao 1e3ca4c6eb
Merge branch 'develop' into feature/query 2021-06-03 22:12:53 +08:00
Shengliang Guan bd755045a5 fix conflicts while mege from master 2021-06-03 21:25:22 +08:00
Shengliang Guan 77f208001a Merge from master 2021-06-03 21:23:41 +08:00
Shengliang Guan 8510972602
Merge pull request #6367 from taosdata/test/TD-4043
[TD-4043]fix bug in session window
2021-06-03 21:10:59 +08:00
Shengliang Guan b70bcf30d9
Merge pull request #6364 from taosdata/feature/TD-1920
[TD-1920]fix compact bug:sync sdb to disk when compact end
2021-06-03 21:10:01 +08:00
Shengliang Guan 188fa64069
Merge pull request #6358 from taosdata/feature/TD-4394
[TD-4394]add modify column,tag width implementation
2021-06-03 21:07:49 +08:00
Ping Xiao 61f8139178 update test case 2021-06-03 18:17:22 +08:00
Minglei Jin 0b33fdbec1 [TD-4412]<fix>: add new configuration parameter for db option cachelast 2021-06-03 18:15:36 +08:00
Haojun Liao 7082d8a5e0 [td-255] fix compiler error on windows. 2021-06-03 18:12:56 +08:00
liuyq-617 b1a0b834a1 [TD-4043]fix bug in session window 2021-06-03 10:03:19 +00:00
Elias Soong 7c092bd7d2
Merge pull request #6366 from taosdata/docs/Update-Latest-Feature
[TD-4533] <docs>: fix description about func "taos_stmt_bind_param_ba…
2021-06-03 17:56:30 +08:00
Elias Soong 33c0f3b58a [TD-4533] <docs>: fix description about func "taos_stmt_bind_param_batch". 2021-06-03 17:56:04 +08:00
tickduan 6bfbe73623 modify tips text 2021-06-03 17:50:08 +08:00
lichuang f7190b2fdc [TD-1920]fix compact bug:sync sdb to disk when compact end 2021-06-03 17:48:25 +08:00
Elias Soong 0a831e25c8
Merge pull request #6362 from taosdata/docs/Update-Latest-Feature
[TD-4533] <docs>: describe C/C++ & Java version of Prepare Statement …
2021-06-03 17:01:18 +08:00
Elias Soong 622b711ad1 [TD-4533] <docs>: describe C/C++ & Java version of Prepare Statement api. 2021-06-03 17:00:30 +08:00
bryanchang0603 f797c397e4 [TD-4463] enterprise test pass 2021-06-03 16:54:15 +08:00
tickduan ba6b1a7022 check primary cloumn must timestamp type on project query 2021-06-03 16:39:52 +08:00
bryanchang0603 5288457406 Merge branch 'test/TD-4463' of github.com:taosdata/TDengine into test/TD-4463 2021-06-03 16:15:41 +08:00
huili 761a7e8f37
Merge pull request #6359 from taosdata/test/TD-4523
[TD-4523] add test case
2021-06-03 16:13:39 +08:00
huili 1c9a561aaa
Merge pull request #6357 from taosdata/test/m-td4395
[TD-4395]update test-all.sh
2021-06-03 16:13:21 +08:00
bryanchang0603 904bf2381e [TD-4463] modifying test case for community version 2021-06-03 16:04:48 +08:00
bryanchang0603 91d2d3b85a [TD-4463]rewrite the case to fit develop and community 2021-06-03 15:29:23 +08:00
tomchon b9502d4ba6 temp 2021-06-03 15:23:59 +08:00
tomchon 80911e28f0 Merge branch 'dev/chr' of github.com:taosdata/TDengine into dev/chr 2021-06-03 15:23:27 +08:00
tomchon 1b7ccdcdc4 temp 2021-06-03 15:19:37 +08:00
tomchon f8d81ede65 Merge branch 'develop' of github.com:taosdata/TDengine into dev/chr 2021-06-03 15:03:52 +08:00
bryanchang0603 72e981ef86 Merge branch 'develop' into test/TD-4463 2021-06-03 14:56:36 +08:00
Haojun Liao 9216a9f201 [td-255] 2021-06-03 14:01:15 +08:00
DuanKuanJun e52b2973db
Merge pull request #6346 from taosdata/cq
CQ Fix QueryInfo->window.ekey not align sliding value when pStream->stime == INT64_MIN
2021-06-03 13:35:30 +08:00
yihaoDeng 555fe9e91e [TD-4426]<feature> merge in 2021-06-03 12:45:30 +08:00
lichuang e61ee9fb97 [TD-4394]add modify column,tag width implementation 2021-06-03 11:42:36 +08:00
bryanchang0603 ee9b45ef7d [TD-4523] add test case 2021-06-03 11:37:48 +08:00
Shengliang Guan 67c7d623b7
Merge pull request #6355 from taosdata/feature/TD-1920
[TD-1920]fix compact bug,load dnode-globalcfg mode
2021-06-03 11:23:19 +08:00
liuyq-617 ad31a637f6 [TD-4395]update test-all.sh 2021-06-03 02:54:57 +00:00
bryanchang0603 881e191c4b Merge branch 'develop' into test/TD-4463 2021-06-03 10:42:54 +08:00
bryanchang0603 cc9759f340 Merge branch 'develop' into test/TD-4463 2021-06-03 10:42:20 +08:00
haojun Liao 9c6b148641
Merge pull request #6344 from taosdata/hotfix/TD-4443-2
[TD-4443]timestamp show issue in new join
2021-06-03 10:40:10 +08:00