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

17385 Commits

Author SHA1 Message Date
Haojun Liao bdc83f0210
Merge pull request #7072 from taosdata/fix/TD-5584 
[TD-5631]<fix>fix functionCompatList array overflow access
 2021-08-02 12:25:00 +08:00
Haojun Liao a9db4f829d
Merge pull request #7088 from taosdata/fix/ZhiqiangWang/TD-5547-arm32-byte-alignment-error 
[TD-5547]<fix>: arm32 byte alignment bus error.
 2021-08-02 11:27:49 +08:00
lichuang 1f1510b8be make ci run again 2021-08-02 11:06:30 +08:00
yihaoDeng 27b7eeccf5 Merge branch 'develop' of github.com:taosdata/TDengine into dev 2021-08-02 10:53:55 +08:00
Haojun Liao 699e28bc91
Merge pull request #7073 from taosdata/hotfix/td-5633 
[TD-5633]<fix>:fix memory leak of intermediate buf of block_dist
 2021-08-02 10:45:46 +08:00
Haojun Liao 9b3ca08c37
Merge pull request #7082 from taosdata/hotfix/TD-5582 
[TD-5582]fix interp issues
 2021-08-02 10:35:10 +08:00
wpan 23848d45b0 add connection info to cache when taosd reboot while taos remains open 2021-08-02 10:34:20 +08:00
lichuang 99706aff5d Merge branch 'develop' into fix/TD-5584 2021-08-02 09:54:28 +08:00
Ganlin Zhao 385c4bd132 [TD-5559]<enhance>:[schemaless]add unique id to sml parser logs 2021-08-01 22:35:48 +08:00
Shuduo Sang ede06b75aa
Hotfix/sangshuduo/td 3197 taosdemo coverity scan for master (#7099) 
* [TD-3197]<fix>: taosdemo and taosdump coverity scan issues.

* exit if read sample file failed.

* fix converity scan issue.

* fix coverity scan issue.

* fix coverity scan memory leak.

* fix resource leak reported by coverity scan.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-08-01 13:08:14 +08:00
Shuduo Sang dd5a627bc2
Hotfix/sangshuduo/td 3197 fix taosdemo coverity scan (#7098) 
* [TD-3197] <fix>: fix taosdemo coverity scan issues.

* [TD-3197] <fix>: fix taosdemo coverity scan issue.

fix subscribeTest pids uninitialized.

* [TD-3197] <fix>: fix taosdemo coverity scan issues.

* [TD-3197] <fix>: fix coverity scan issues.

check super tbl info pointer.

* [TD-3197] <fix>: fix coverity scan issues.

move sub tbl query thread join into loop

* [TD-3197] <fix>: fix coverity scan issues.

remove unused variable

* [TD-3197] <fix>: fix coverity scan issues.

use more secure random library

* [TD-3197] <fix>: fix coverity scan issues.

use strncpy for more safe

* [TD-3197] <fix>: fix taosdemo coverity scan issue.

replace arc4random with rand().

* [TD-3197] <fix>: fix coverity scan issues.

check stb info pointer for start time

* [TD-3197] <fix>: fix coverity scan issues.

fix strcpy vulnerability

* [TD-3197] <fix>: fix taosdemo coverity scan issue.

modify taosdemoTest2. try to check database continously.

* [TD-3197] <fix>: taosdemo coverity scan issues.

* [TD-3197] <fix>: fix memory leak when parsing arguments.

* [TD-3197] <fix>: fix cmake strip arguments.

* [TD-3197] <fix>: taosdemo coverity scan.

fix cmake string manipulation.

* [TD-3197]<fix>: taosdemo coverity scan issue.

configDir buffer overwrite.

* [TD-3197]<fix>: coverity scan issue.

taosdump argument validation.

* [TD-3197]<fix>: taosdemo and taosdump coverity scan issues.

* [TD-3197]<fix>: taosdemo coverity scan.

append result buf to file. for develop branch.

* exit if read sample file failed.

* fix converity scan issue.

* fix coverity scan issue.

* fix coverity scan memory leak.

* fix resource leak reported by coverity scan.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-08-01 13:06:27 +08:00
Shengliang Guan ca0177284f
Merge pull request #7086 from taosdata/feature/m2d7 
Merge from master into develop
 2021-08-01 11:20:15 +08:00
Zhiqiang Wang 84ef79fed1
[TD-5656]<fix>: arm32 socket post result \0 error. (#7092) 2021-08-01 10:34:25 +08:00
Shuduo Sang 310ef26829
[TD-5625]<fix>: taosdemo don't use printf for data generation. (#7094) 
* [TD-5625]<fix>: taosdemo don't use printf for data generation.

* re cherry-pick
 2021-08-01 10:33:28 +08:00
Shuduo Sang 877f20cc7c
[TD-5625]<fix>: taosdemo don't use printf for data generation. (#7093) 2021-08-01 09:15:24 +08:00
shenglian zhou 8b9d334acf Merge branch 'develop' into hotfix/td-5633 2021-07-31 21:16:51 +08:00
Haojun Liao dcabef9a7c
Merge pull request #7077 from taosdata/feature/query 
Feature/query
 2021-07-31 14:56:23 +08:00
shenglian zhou ddb5262ff2 Merge branch 'hotfix/td-5633' of github.com:taosdata/TDengine into hotfix/td-5633 2021-07-31 11:24:16 +08:00
shenglian zhou 754b7b4241 [TD-5659]<fix>:start taos processing with subprocess instead of internal function 2021-07-31 11:23:23 +08:00
shenglian zhou f385b19002 [TD-5633]<fix>:fix memory leak of intermediate result buf 2021-07-31 11:22:48 +08:00
shenglian zhou babde623be [TD-5235]<fix>:try not to copy the content of rpc msg 2021-07-31 11:22:48 +08:00
shenglian zhou 7032e5a00b [TD-5235]<feature>:offload msg processing from rpc thread to tsc scheduler 2021-07-31 11:22:48 +08:00
xiaolei li da3e784721
[TD-4852]<jdbcDemo.java,pom.xml> fix host,error diplay (#6929) 2021-07-31 08:07:25 +08:00
Zhiqiang Wang 929a7ce4b6
[TD-5585]<fix>: arm32 python fromtimestamp error. (#7090) 2021-07-31 08:05:22 +08:00
Shuduo Sang ef8bd46b49
Feature/sangshuduo/td 3973 use jemalloc (#7071) 
* [TD-3973]<feature>: add jemalloc as submodule.

* add macro definitions in cmake.

* [TD-3973]<feature>: use jemalloc.

build works as following instructions:

cmake .. -DJEMALLOC_ENABLED=true

make

* fix jemalloc at tag 5.2.1

* link jemalloc works.

* make install works.

* support jemalloc in release.sh.

* release script works.

* fix a typo.

* [TD-3937]<feature>: support jemalloc

add install funtion to all scripts.

* adjust install_jemalloc() position for update check compatiblity.

* fix position bug.

* add ldconfig for jemalloc library cache refresh.

* add /etc/ld.so.conf.d/jemalloc.conf for centos

* check ver comp by file.

* fix makeclient.sh

* fix install script typo mistake.

* change minimal compatible version back to 2.0.0.0

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-07-31 01:07:24 +08:00
jiajingbin 92ea7517f6 add tdSql.execute('reset query cache') to function resHandle() 2021-07-30 17:40:02 +08:00
Haojun Liao a849451703
Merge branch 'develop' into feature/query 2021-07-30 16:30:49 +08:00
Shengliang Guan 8d2c151274 Merge remote-tracking branch 'origin/develop' into feature/m2d7 2021-07-30 16:29:08 +08:00
Haojun Liao 6f4257aa9a
Merge pull request #7049 from taosdata/fix/TD-5534 
[TD-5534]<fix>:fix the coverity high risk of client&query
 2021-07-30 16:26:54 +08:00
tomchon 29f6538b67 [TD-5547]<fix>: arm32 byte alignment bus error. 2021-07-30 15:44:13 +08:00
lichuang 0ecd1fd646 [TD-5631]<feature>add smallblock stat 2021-07-30 14:36:33 +08:00
wpan 755f666e2a fix bug 2021-07-30 14:30:32 +08:00
Shuduo Sang 3102cdee2e
Hotfix/sangshuduo/td 5445 for master (#7083) 
* [TD-5445]<fix>: taosdemo bug stmt interface with sample data.

sync from develop branch.

* refactoring some macros.

* fix mac compile error.
 2021-07-30 14:18:05 +08:00
Shengliang Guan 7fac670e59 change version number 2021-07-30 13:58:09 +08:00
Shengliang Guan 6188c139e1 change version number 2021-07-30 13:55:33 +08:00
Shengliang Guan c4aa654bd9 Merge remote-tracking branch 'origin/master' into feature/m2d7 2021-07-30 13:53:33 +08:00
Shengliang Guan f8905c8cbc Merge remote-tracking branch 'origin/develop' into feature/m2d7 2021-07-30 13:53:25 +08:00
Shengliang Guan 4dac6ac4f1 merge from master 2021-07-30 13:52:54 +08:00
Shuduo Sang fae99ad04d
[TD-5628]<fix>: prompt --force-keep-file if upgrade lower version with 2.0.16.0 (#7080) 2021-07-30 13:13:38 +08:00
Hui Li 1f4d51c1bc
Merge pull request #7068 from taosdata/test/TD-5401-m 
[TD-5401]make CI happy
 2021-07-30 11:51:31 +08:00
Hui Li 7258266c87
Merge pull request #7069 from taosdata/test/TD-5401-d 
[TD-5401]make CI happy
 2021-07-30 11:51:24 +08:00
Haojun Liao 89a15326f0 Merge branch 'develop' into feature/query 2021-07-30 11:37:46 +08:00
wangmm0220 5f37d8a2a5 [TD-5534]<fix>:fix test case out of date error 2021-07-30 11:27:34 +08:00
wpan 63e5c2147b Merge branch 'master' into hotfix/TD-5582 2021-07-30 10:39:29 +08:00
wpan ca985ec7c6 fix interp bug 2021-07-30 10:38:15 +08:00
liuyq-617 cd744f5fa7 fix 2021-07-30 09:35:58 +08:00
liuyq-617 72a05d1e80 fix 2021-07-30 09:32:13 +08:00
wangmm0220 b9db84586c [TD-5534]<fix>:fix high risk strncpy to tstrncpy 2021-07-30 02:17:10 +08:00
Shuduo Sang c6f660a88e
Hotfix/sangshuduo/td 3973 use jemalloc for master (#7074) 
* [TD-3973]<feature>: add jemalloc as submodule.

* [TD-3973]<feature>: add jemalloc as submodule.

* [TD-3973]<feature>: use jemalloc.

build works as following instructions:

cmake .. -DJEMALLOC_ENABLED=true

make

* fix jemalloc at tag 5.2.1

* fix conflicts

* make install works.

* fix conflicts.

* release script works.

* fix typo

* [TD-3937]<feature>: support jemalloc

add install funtion to all scripts.

* adjust install_jemalloc() position for check compatibility.

* fix position bug.

* add ldconfig for jemalloc library cache refresh.

* cherry pick from develop branch.

* cherry pick from develop branch.

* fix install_jemalloc() in install_client.sh.

* fix makeclient.sh.

* fix install script typo mistake.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-07-29 23:28:47 +08:00
Haojun Liao c0dfdc9c73 [td-225]add check for malloc failure. 2021-07-29 23:24:46 +08:00