xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
15,526 Commits 3 Branches 0 Tags 479 MiB
Commit Graph

15526 Commits

Author SHA1 Message Date
yihaoDeng fba02adc52 [TD-4355]<fix> 2021-05-27 01:29:01 +08:00
haojun Liao 8c666ff918
Merge pull request #6236 from taosdata/fix/query 
Fix/query
 2021-05-26 22:20:11 +08:00
Shuduo Sang 0c4075e09f
[TD-4533]<fix>: taosdemo resub if resubAfterConsume != -1 (#6243) 
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-26 21:02:14 +08:00
tickduan f3b4252526 Merge branch 'master' into cq with continue query funciton 2021-05-26 20:53:20 +08:00
tickduan 4b4199ce41 cq support continue query from last stop time 2021-05-26 20:50:00 +08:00
Haojun Liao 315ce829e5 [td-225] merge develop 2021-05-26 19:52:19 +08:00
Haojun Liao f0a7a53375 [td-225] 2021-05-26 19:49:54 +08:00
Haojun Liao 96b0705a6b [td-225]add test cases. 2021-05-26 19:43:51 +08:00
lichuang d66b6e2d85 [TD-4034]refactor code 2021-05-26 19:35:47 +08:00
Shengliang Guan 6b3e339c76
Merge pull request #6238 from taosdata/feature/m2d 
Feature/m2d
 2021-05-26 18:43:15 +08:00
dapan1121 389e58d075 Merge branch 'feature/TD-4034' into feature/TD-3950 2021-05-26 18:31:34 +08:00
dapan1121 ca4e75b69a fix bug 2021-05-26 18:30:31 +08:00
lichuang 6213438f2e [TD-4034]when config changed,apply a commit msg then config will be applied 2021-05-26 18:27:22 +08:00
lichuang da4b78f1ba [TD-4034]when config changed,apply a commit msg then config will be applied 2021-05-26 18:27:04 +08:00
Haojun Liao 013d6f840d [td-225] 2021-05-26 17:55:59 +08:00
dapan1121 1abd799eba Merge branch 'feature/TD-4034' into feature/TD-3950 2021-05-26 17:50:19 +08:00
lichuang 1062357eee [TD-4034]when cacheLast option changed,restore or free cache last data 2021-05-26 17:36:51 +08:00
Haojun Liao d61acaa9e7 [td-225]fix compiler error on mac. 2021-05-26 17:29:20 +08:00
Haojun Liao 15ba059cea [td-225]fix compiler error on mac. 2021-05-26 17:25:12 +08:00
Haojun Liao 70720a2a18 [td-225] fix bug found by regression test. 2021-05-26 17:20:58 +08:00
Shengliang Guan 3b5fc0cb46 fix log error 2021-05-26 16:44:31 +08:00
Elias Soong 0a38b29c3d [TD-3963] <docs>: allow alter some database parameters without reboot server. 2021-05-26 16:06:38 +08:00
Haojun Liao 8adf685f56 [td-4329]update the error code,add a new error code TSDB_CODE_TSC_INVALID_OPERATION, instead of TSDB_CODE_TSC_INVALID_SQL. 2021-05-26 15:24:46 +08:00
liuyq-617 2270703980 modify env 2021-05-26 07:21:07 +00:00
liuyq-617 aaf9081309 modify env 2021-05-26 07:19:53 +00:00
Haojun Liao 9406b3a414 [td-225] fix compiler error on mac. 2021-05-26 15:11:37 +08:00
Elias Soong ede8a4a6f0 [TD-4089] <docs>: stopping taosd service may take remarkable time. 2021-05-26 15:08:53 +08:00
Hongze Cheng 48831ee69d Merge branch 'develop' into feature/TD-1568 2021-05-26 14:46:46 +08:00
Shengliang Guan e47f0b60d0 Merge from master 2021-05-26 14:34:51 +08:00
Shengliang Guan 541741cdda Merge from master into develop 2021-05-26 14:33:16 +08:00
Haojun Liao 010ac0e84c [td-225] fix compiler error. 2021-05-26 14:26:02 +08:00
Shuduo Sang 40910f6b67
Feature/sangshuduo/td 4068 taosdemo stmt (#6237) 
* merge with develop branch.

change query/tests/CMakeLists.txt to allow unused function and variable.

* refactor data generating.

* refactor.

* refactor.

* refactor.

* refactor.

* refactor

* add prepare stmt function.

* refactor get rand timestamp.

* fix windows compile error.

* copy logic of generate data for stmt.

* insert data basically works now.

* fix windows compile issue.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-26 14:25:50 +08:00
Haojun Liao 7fa9ecbd47 [td-225]fix compiler error. 2021-05-26 14:22:28 +08:00
Haojun Liao 649669ec44 [td-225] fix compiler error. 2021-05-26 14:13:44 +08:00
Haojun Liao 9673cfb742 [td-225] fix compiler error. 2021-05-26 14:09:25 +08:00
Elias Soong 89fd502625 [TD-3948] <docs>: column names can be away from table name in insert. 2021-05-26 13:51:06 +08:00
Shengliang Guan b9d4476be0 Merge from develop 2021-05-26 13:42:06 +08:00
Haojun Liao d21beef464 [td-4351]<fix>: suppress error msg if super table is missing. 2021-05-26 13:36:49 +08:00
Shengliang Guan 2be5b246d1
Merge pull request #6235 from taosdata/hotfix/TD-4323 
TD-3279 TD-4328
 2021-05-26 13:25:29 +08:00
Shuduo Sang cadf32d312
refactor each query verbose print. (#6233) 
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-26 12:14:42 +08:00
Haojun Liao eecd5c9440 [td-225] merge develop 2021-05-26 11:22:20 +08:00
Shengliang Guan c96fb6b0f8 TD-4328 2021-05-26 11:18:29 +08:00
Haojun Liao 75ca521a86 [td-225] add log for debug purpose 2021-05-26 11:00:29 +08:00
haojun Liao a09148b922
Merge pull request #6230 from taosdata/fix/query 
[td-225] add log.
 2021-05-26 11:00:02 +08:00
Shengliang Guan a566615eb7 TD-3279 TD-4328 2021-05-26 10:28:58 +08:00
Haojun Liao 162c01243d Merge branch 'master' into fix/query 2021-05-26 10:18:04 +08:00
Haojun Liao 2eb18e101c [td-225] add test cases. 2021-05-26 10:05:09 +08:00
Shuduo Sang 04d464bdc9
Hotfix/sangshuduo/td 3783 taosdemo invalid rand string (#6228) 
* [TD-3783]<fix>: taosdemo for windows generates rand string invalid.

* refactor disorder timestamp.

* refactor debug print.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-26 09:34:45 +08:00
Shengliang Guan f3ae6fb57f
Merge pull request #6229 from taosdata/hotfix/TD-4323 
[TD-4323]<fix>:  the deleted vnode does not need to commit, so as to …
 2021-05-26 09:13:21 +08:00
Haojun Liao 54fcf51600 [td-225] fix compiler error. 2021-05-25 22:40:10 +08:00