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

14658 Commits

Author SHA1 Message Date
Shuduo Sang d19b81c943 Merge branch 'develop' into feature/sangshuduo/TD-4068-taosdemo-stmt 2021-05-14 10:17:35 +08:00
Shengliang Guan 036f37c934
Merge pull request #5969 from lichuang/feature/TD-3963 
[TD-3963]tsdbRepo config hot change
 2021-05-14 10:07:28 +08:00
huili dec7e951d2
Merge pull request #6120 from taosdata/xiaoping/add_test_case 
[TD-4179]<test>: add test case
 2021-05-14 10:01:01 +08:00
Shuduo Sang 11d3aaf2da fix windows compile issue. again. 2021-05-13 23:40:52 +08:00
Shuduo Sang fe4984290c fix windows compile issue. 2021-05-13 23:33:54 +08:00
Shuduo Sang f5f714a3ce merge with develop branch. 2021-05-13 23:08:17 +08:00
Shuduo Sang 466ae04d67 Merge branch 'develop' into feature/sangshuduo/TD-4068-taosdemo-stmt 2021-05-13 22:58:26 +08:00
Shuduo Sang 91249c2e50
Hotfix/sangshuduo/td 4136 taosdemo records morethan 32767 for develop (#6119) 
* [TD-4136]<fix>: taosdemo records per req more than 32767.

for develop branch.

* change taosRandom() to rand_bool() for bool data.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-13 22:54:54 +08:00
Shuduo Sang 8517694940 [TD-4068]<feature>: taosdemo support stmt interface. 
construct framework.
 2021-05-13 20:37:34 +08:00
Shuduo Sang d0aaecede9 merge with develop branch. 2021-05-13 18:01:58 +08:00
Ping Xiao 6db4fc6c00 [TD-4179]<test>: add test case 2021-05-13 09:44:10 +00:00
haojun Liao fde5ca2b65
Merge pull request #6114 from taosdata/origin/hotfix/TD-4172 
[TD-4172]<fix>
 2021-05-13 16:02:39 +08:00
liuyq-617 68d9c2417f [TD-4114]<test> add test case for bind batch 2021-05-13 15:39:53 +08:00
Elias Soong 8935a06161
Merge pull request #6117 from taosdata/docs/Update-Latest-Feature 
[TD-2639] <docs>: update "stime" parameter in "taos_open_stream" func.
 2021-05-13 15:19:30 +08:00
Shuduo Sang 8b011772ac
[TD-4152]<enhance>: taosdemo reduce prompt and query systeminfo. (#6108) 
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-13 13:44:06 +08:00
Shuduo Sang 6892a32fe5
[TD-4173]<fix>: compile failed with gcc 4.8.5 on centos7. (#6111) 2021-05-13 13:02:35 +08:00
Shuduo Sang 78c24ae135
Hotfix/sangshuduo/td 3914 taosdemo func param segfault for develop (#6110) 
* [TD-3914]<fix>: taosdemo check func param input more.

for develop branch.

* [TD-3914]<fix>: taosdemo check func param more.

for develop branch.

* [TD-3914]<fix>: taosdemo input argument validation. (#6097)

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-13 12:24:45 +08:00
yihaoDeng b14d3ea772 [TD-4172]<fix> 2021-05-13 11:49:12 +08:00
haojun Liao 8f8cf26ced
Merge pull request #6098 from taosdata/feature/TD-4135 
[TD-4135]support user specify column in bind
 2021-05-13 11:39:50 +08:00
lichuang d17e4e56e0 Merge remote-tracking branch 'upstream/develop' into feature/TD-3963 2021-05-13 08:35:55 +08:00
Shuduo Sang d7a11fb8b8
Hotfix/sangshuduo/td 3992 taosdemo subscribe for develop (#6109) 
* [TD-3992]<fix>: taosdemo subscribe.

* [TD-3992]<fix>: taosdemo subscribe.

refactor sync/async mode.

* [TD-3992]<fix>: taosdemo subscribe stable.

add missed code lines

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-13 04:25:10 +08:00
Shuduo Sang c4ac43af99
[TD-4158]<fix>: taosdemo cmake failed with low version git. (#6107) 2021-05-13 00:19:13 +08:00
Shuduo Sang 15ad9bd137
[TD-4130]<fix>: taosdemo subscribe stable. (#6090) 
* [TD-4130]<fix>: taosdemo subscribe stable.

for develop branch.

* [TD-4130]<fix>: taosdemo subscribe stable.

fix append result to file.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-12 19:43:44 +08:00
Shengliang Guan c72978d55b
Merge pull request #6092 from taosdata/feature/m2d 
Feature/m2d
 2021-05-12 19:25:00 +08:00
Huo Linhe 00204198aa
[TD-182]: bump python connector version to v2.0.10 (#6091) 
Also fix url error in setup.py
 2021-05-12 18:50:53 +08:00
Shengliang Guan c1ebb6b989
Merge pull request #6093 from taosdata/fix/TD-4145 
[TD-4145]fix compile in ningsi60
 2021-05-12 17:42:34 +08:00
Shuduo Sang a8f2321479 [TD-4068]<feature>: taosdemo supports stmt interface. 2021-05-12 16:11:36 +08:00
Elias Soong fcfad6c0d9 [TD-2639] <docs>: update "stime" parameter in "taos_open_stream" func. 2021-05-12 15:43:23 +08:00
dapan1121 46546c9d56 support user specify column 2021-05-12 14:41:59 +08:00
lichuang d9127c0501 [TD-3963]handle oom in tsdbExpendPool 2021-05-12 14:41:33 +08:00
lichuang dffd44c6c6 Merge remote-tracking branch 'upstream/develop' into feature/TD-3963 2021-05-12 14:23:48 +08:00
lichuang 15a7d1431d [TD-4145]fix compile in ningsi60 2021-05-12 10:32:10 +08:00
Shengliang Guan ad22414093 Merge from master into develop 2021-05-12 10:07:21 +08:00
Shengliang Guan e90be7aad9 Merge remote-tracking branch 'origin/develop' into feature/m2d 2021-05-12 10:04:26 +08:00
Shengliang Guan 24473f0cb0 Merge from master into develop 2021-05-12 10:01:50 +08:00
Huo Linhe 39f8213080
[TD-182]<enhance>: use single repo for python connector (#6036) 
* [TD-182]<enhance>: use single repo for python connector

Remove code for each platform and build up one single python code base
for windows/osx/linux platforms and python2/python3 runtime.

* [TD-182]<enhance>: remove redundant code in python connector

* [TD-4149] <fix>: fix python connection config error
 2021-05-12 09:49:26 +08:00
zyyang 5131e7b12a
Fix/td 3986 (#6088) 
* [TD-3986]<fix>: fix subscribe test case error

* change jdbc version number
 2021-05-12 09:41:03 +08:00
Shuduo Sang e8190f17c8
[TD-4136]<fix>: taosdemo records per req more than 32767. (#6087) 
for develop branch.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-11 21:38:18 +08:00
Shuduo Sang 95139cf4a1
[TD-4130]<fix>: taosdemo subscribe super table. (#6086) 
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-11 21:36:48 +08:00
Shengliang Guan 644f41a0bb Merge from master into develop 2021-05-11 20:58:18 +08:00
Shengliang Guan ed903bd9eb
Merge pull request #6074 from taosdata/feature/m2d 
Feature/m2d
 2021-05-11 20:31:05 +08:00
Shengliang Guan bb7e1b224c
Merge pull request #6080 from taosdata/feature/TD-4038 
[TD-4038]support bind  multiple tables
 2021-05-11 20:30:40 +08:00
huili 9c0e8c9d78
Merge pull request #6070 from taosdata/test/TD-3960 
[TD-3960] <test> add case for TD-3960
 2021-05-11 19:32:52 +08:00
Shuduo Sang af33e11840
[TD-4136]<fix>: taosdemo max records per req < 32767 (#6082) 
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-11 19:06:02 +08:00
dapan1121 e063893da0 Merge branch 'feature/TD-4038' of https://github.com/taosdata/TDengine into feature/TD-4038 2021-05-11 19:00:17 +08:00
dapan1121 ace482e293 fix bug 2021-05-11 18:59:51 +08:00
dapan1121 eab8e5e8f2
Update makefile 2021-05-11 17:07:35 +08:00
Shuduo Sang 055919a7a7
Hotfix/sangshuduo/td 3992 taosdemo subscribe (#6062) 
* [TD-3902]<fix>: taosdemo subscribe.

* [TD-3992]<fix>: taosdemo subscribe.

refactor sync/async mode.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-11 15:38:05 +08:00
dapan1121 c8ff286cbe Merge branch 'feature/TD-4038' of https://github.com/taosdata/TDengine into feature/TD-4038 2021-05-11 15:33:02 +08:00
dapan1121 fd500aba59 add records num check 2021-05-11 15:32:28 +08:00