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

14827 Commits

Author SHA1 Message Date
Shengliang Guan 0542a34500 Merge remote-tracking branch 'origin/master' into feature/m2d 2021-05-22 17:32:22 +08:00
Shengliang Guan 3a80b71bb6 Merge remote-tracking branch 'origin/develop' into feature/m2d 2021-05-22 17:32:16 +08:00
Shuduo Sang db03be6406
[TD-4296]<fix>: taosdemo sub keepProgress. (#6200) 
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-22 16:59:19 +08:00
Shuduo Sang 795503ccbe
[TD-4296]<fix>: taosdemo sub keepProgress. (#6201) 
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-22 16:17:03 +08:00
zyyang 696c784377
Fix/td 4086 (#6153) 
* [TD-3086]<fix>: clean out unnecessary file in packaging scripts

* [TD-4224]<enhance>: reduce grafana module size in packaging

* change

* [TD-4228]<fix>: error or warn while lost grafanaplugin or go submodule

Conflicts:
	packaging/deb/makedeb.sh
	packaging/rpm/tdengine.spec
	packaging/tools/make_install.sh
	packaging/tools/makeclient.sh
	packaging/tools/makeclient_power.sh
	packaging/tools/makepkg.sh
	packaging/tools/makepkg_power.sh

Co-authored-by: Huo Linhe <linhehuo@gmail.com>
 2021-05-22 15:55:32 +08:00
huili 444753f30a
Merge pull request #6199 from taosdata/xiaoping/test_case 
[TD-4263]<test>: update performance test script
 2021-05-22 14:53:02 +08:00
huili f33ea803ff
Merge pull request #6187 from taosdata/test/TD-4153 
[TD-4153] <test> add case to resolve use taosdemo tools insert and qu…
 2021-05-22 14:52:22 +08:00
Shengliang Guan ec79a70e40 Merge from master 2021-05-22 14:37:55 +08:00
Shengliang Guan 4e4f2aee8a
Merge pull request #6198 from taosdata/hotfix/TD-3279 
[TD-3279] Send confirmation message when vnode is down
 2021-05-22 14:27:59 +08:00
Ping Xiao 9ef6b68030 [TD-4263]<test>: update performance test script 2021-05-22 13:56:06 +08:00
Shengliang Guan 4e39ed41a5 [TD-3279] Send confirmation message when vnode is down 2021-05-22 13:13:55 +08:00
Shuduo Sang 2d43e7f06a
add mips64 build instruction. (#6190) 
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-22 11:55:12 +08:00
Shuduo Sang 171ca11a0a
Update README-CN.md (#6191) 2021-05-22 11:54:50 +08:00
Shuduo Sang fc394200e4
Hotfix/sangshuduo/td 4240 taosdemo subscribe toomuch for develop (#6193) 
* [TD-4240]<fix>: taosdemo subscribe more than max query sql count.

* [TD-4240]<fix>: taosdemo subscribe more than 100.

fix tsub sequence bug.

* [TD-4240]<fix>: taosdemo subscribe more than 100.

fix auto create table.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-21 23:20:42 +08:00
Shuduo Sang c74651a6cb
Hotfix/sangshuduo/td 4136 taosdemo records morethan 32767 for develop (#6189) 
* [TD-4136]<fix>: taosdemo records per req more than 32767.

for develop branch.

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

* [TD-4136]<fix>: taosdemo check insert rows not more than 32767.

check insert rows for progressive.

* fix with answer_yes.

* fix interlace rows checking position.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-21 21:35:41 +08:00
Shuduo Sang dbf565c9e6
Hotfix/sangshuduo/td 4240 taosdemo subscribe morethan 100 (#6192) 
* [TD-4240]<fix>: taosdemo subscribe more than max query sql count.

* [TD-4240]<fix>: taosdemo subscribe more than 100.

fix tsub sequence bug.

* [TD-4240]<fix>: taosdemo subscribe more than 100.

fix auto create table.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-21 21:35:01 +08:00
huili 06373ae464
Merge pull request #6195 from taosdata/hotfix/test 
[TD-4182]<test> specify column for single batch bind
 2021-05-21 19:54:24 +08:00
root 83187703a8 [TD-4182]<test> specify column for single batch bind 2021-05-21 11:51:33 +00:00
Shuduo Sang 9150c57764
Hotfix/sangshuduo/td 4136 taosdemo records morethan 32767 (#6188) 
* [TD-4136]<fix>: taosdemo max records per req < 32767

* [TD-4136]<fix>: taosdemo check insert rows not more than 32767.

check insert rows for progressive.

* fix with answer_yes.

* add extra prompt.

* fix interlace rows checking position.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-21 17:49:44 +08:00
Shengliang Guan 6708db1fe3
Merge pull request #6186 from taosdata/feature/m2d 
Feature/m2d
 2021-05-21 15:52:30 +08:00
Shuduo Sang 972a75c3fa
Hotfix/sangshuduo/td 3913 mips compile support for develop (#6184) 
* [TD-3913]<fix>: mips compile support.

* [TD-3913]<fix>: mips64 support.

* fix osSignal.c

* fix tcrc32c.c

* fix cmake.

* fix osInc.h

* fix gcc 4.8 compile error.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-21 15:15:28 +08:00
Shuduo Sang 17ee732381
Hotfix/sangshuduo/td 3913 mips compile support (#6182) 
* [TD-3913]<fix>: mips compile support.

* [TD-3912]<fix>: support mips64 compile.

add mips64 header file and modify tcrc32c.c for mips64.

* [TD-3913]<fix>: mips compile support.

verified on real loongson machine.

* fix cmake.

* fix gcc 4.8 compile error.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-21 15:15:01 +08:00
DuanKuanJun 0630af70b1
Merge pull request #6172 from taosdata/cq 
fix memory leak when calloc sqlstr error.
 2021-05-21 15:06:16 +08:00
Shengliang Guan 50ee6f1091 Merge from master 2021-05-21 14:50:56 +08:00
Shengliang Guan c60fcb415b
Merge pull request #6185 from taosdata/feature/td-3746 
[TD-3746]<feature>:save grant objects to monitor database
 2021-05-21 14:45:24 +08:00
cpwu 3062b1dabb [TD-4153] <test> add case to resolve use taosdemo tools insert and query operation 2021-05-21 14:37:52 +08:00
Shengliang Guan 47bb45ef3a
Merge pull request #6179 from taosdata/feature/TD-1920 
Feature/td 1920
 2021-05-21 14:28:34 +08:00
huili 870c05ad3a
Merge pull request #6129 from taosdata/xiaoping/add_test_case 
[TD-4179]<test>: add test case
 2021-05-21 13:58:33 +08:00
huili 96a0079601
Merge pull request #6181 from taosdata/xiaoping/test_case 
[TD-4263]<test>: update performance test script
 2021-05-21 13:58:24 +08:00
haojun Liao 8e0566557b
Merge pull request #6180 from taosdata/feature/TD-4264 
[TD-4264]apercentile issue
 2021-05-21 13:58:17 +08:00
Shuduo Sang 891886ce56
Hotfix/sangshuduo/td 4136 taosdemo records morethan 32767 for develop (#6175) 
* [TD-4136]<fix>: taosdemo records per req more than 32767.

for develop branch.

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

* [TD-4136]<fix>: taosdemo check insert rows not more than 32767.

check insert rows for progressive.

* fix with answer_yes.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-21 13:11:52 +08:00
lichuang e38362c037 [TD-1920]fix compile error 2021-05-21 09:43:05 +08:00
lichuang c24a63ecd4 Merge branch 'develop' into feature/TD-1920 2021-05-21 09:37:35 +08:00
shenglian zhou d2de6c5fa3 [TD-3746]<feature>:save grant objects to monitor database 2021-05-21 08:56:27 +08:00
dapan1121 c820edc32a fix bug 2021-05-21 08:33:44 +08:00
Shuduo Sang d324edadfe
Hotfix/sangshuduo/td 4136 taosdemo records morethan 32767 (#6177) 
* [TD-4136]<fix>: taosdemo max records per req < 32767

* [TD-4136]<fix>: taosdemo check insert rows not more than 32767.

check insert rows for progressive.

* fix with answer_yes.

* add extra prompt.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-21 06:24:17 +08:00
Shuduo Sang 243a3d16b6
Feature/sangshuduo/td 4068 taosdemo stmt (#6178) 
* merge with develop branch.

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

* refactor data generating.

* refactor.

* refactor.

* refactor.

* refactor.

* refactor

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-20 23:25:12 +08:00
Ping Xiao 4b016b75bb [TD-4263]<test>: update performance test script 2021-05-20 19:08:42 +08:00
Shengliang Guan d05fa5c8d4
Merge pull request #6145 from taosdata/feature/m2d 
Feature/m2d
 2021-05-20 18:57:40 +08:00
Shuduo Sang 608e67826d
[TD-4272]<fix>: taosdemo specify columns. (#6173) 
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-20 18:41:55 +08:00
Shuduo Sang 824eb0f313
[TD-4272]<fix>: taosdemo specify columns. (#6174) 
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-20 18:41:35 +08:00
lichuang 9958b3d8d2 [TD-1920]add mnode compact wal functions 2021-05-20 18:19:27 +08:00
Huo Linhe f0b77fa3c3
[TD-4258]<fix>: speedup nodejs fetchall() with taos_fetch_block (#6165) 2021-05-20 17:16:09 +08:00
lichuang 99f7359390 [TD-1920]add mnode compact wal functions 2021-05-20 16:04:53 +08:00
lichuang a12b0e7175 [TD-1920]add mnode compact wal functions 2021-05-20 15:12:34 +08:00
Shuduo Sang c69604fdb4
Hotfix/sangshuduo/td 4238 taosdemo async for develop (#6171) 
* [TD-4238]<fix>: taosdemo async sub.

for develop branch.

* [TD-4238]<fix>: taosdemo async subscribe

subsribe sql command do not use aggregation functions.

* cherry pick f5e4cdd1f7cffc4ee04fc7d043e4841bd1dd9961

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

fix super table sub result file.

* fix specified sub sync mode.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-20 14:51:59 +08:00
tickduan 3500811178 fix memory leak when calloc sqlstr error. 2021-05-20 14:23:01 +08:00
Shuduo Sang 4697cdfdaf
Hotfix/sangshuduo/td 4238 taosdemo async subscribe (#6170) 
* [TD-4238]<fix>: taosdemo async subscribe.

* [TD-4238]<fix>: taosdemo async subscribe

subsribe sql command do not use aggregation functions.

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

interval.

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

fix super table sub result file.

* fix specified sub sync mode.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-20 14:01:32 +08:00
Shuduo Sang 0a07ea10ad
Feature/sangshuduo/td 4068 taosdemo stmt (#6166) 
* merge with develop branch.

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

* refactor data generating.

* refactor.

* refactor.

* refactor.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-05-20 13:11:48 +08:00
lichuang 7316fb8979 [TD-1920]add mnode compact wal functions 2021-05-20 11:06:28 +08:00