liuyq-617
f48e0bbc1e
test[ci skip]
2021-08-09 20:28:24 +08:00
liuyq-617
224986faf2
test[ci skip]
2021-08-09 20:23:20 +08:00
Shengliang Guan
63559e2092
Merge pull request #7142 from taosdata/hotfix/2.0
...
Hotfix/2.0
2021-08-09 11:58:45 +08:00
xywang
1ec2cff29a
[TD-5784]<fix>: fixed a wrong check
2021-08-09 11:04:16 +08:00
Shengliang Guan
4e9fb4470b
Merge pull request #7218 from taosdata/feature/TD-5784-2.0
...
[TD-5784]<fix>: fixed some potential memory leak bugs
2021-08-09 10:25:02 +08:00
Shengliang Guan
081e91d163
Merge from 2.0
2021-08-09 10:11:20 +08:00
Shuduo Sang
a93326c979
[TD-5872]<fix>: taosdemo stmt performance. ( #7236 )
2021-08-07 14:05:57 +08:00
Hui Li
563213d1bc
Merge pull request #7221 from taosdata/test/TD-5773-2.0
...
[TD-5773]<CI>add some arm env in Drone
2021-08-07 10:26:16 +08:00
Linhe Huo
14ab3747e6
[TD-5860]<fix>: fix grafanaplugin error in grafana 6.x(6.2+) ( #7224 )
2021-08-06 14:57:38 +08:00
liuyq-617
90ffa91b2e
[TD-5773]<CI>add some arm env in Drone
2021-08-06 13:45:34 +08:00
xywang
1cf81a8594
[TD-5784]<fix>: fixed some potential memory leak bugs
2021-08-06 11:48:20 +08:00
Shengliang Guan
0a3302fa20
Merge remote-tracking branch 'origin/2.0' into hotfix/2.0
2021-08-06 11:32:24 +08:00
Shuduo Sang
c6474ce1bc
Hotfix/sangshuduo/td 5811 taosdemo delay us for 2.0 ( #7205 )
...
* [TD-5811]<fix>: taosdemo use us to count delay.
to avoid very large number if the delay is 0ms.
* fix interlace delay unit.
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-08-06 09:17:27 +08:00
Shengliang Guan
ece9cc9acf
Merge pull request #7200 from taosdata/release/ver-2.0.20.12
...
change version number
2021-08-06 09:15:17 +08:00
Shuduo Sang
1c7fe38384
Hotfix/sangshuduo/td 5725 taosdump help timestamp for 2.0 ( #7192 )
...
* [TD-5725]<fix>: taosdump --help, regarding acceptable timestamp.
* make example date time same.
2021-08-06 00:38:16 +08:00
tomchon
988f3f72fc
modify dockerManifest.sh
2021-08-05 20:52:39 +08:00
Shuduo Sang
8b4f05d43a
[TD-5811]<fix>: taosdemo use us to count delay. ( #7183 )
...
to avoid very large number if the delay is 0ms.
2021-08-05 18:55:59 +08:00
Hui Li
2e0b7f0c85
Merge pull request #7167 from taosdata/tomchon-patch-2
...
Update version.inc
2021-08-05 14:30:35 +08:00
Shuduo Sang
3e62ea5041
[TD-5790]<fix>: taosdemo memory corrupted. ( #7170 )
2021-08-05 09:54:31 +08:00
haoranchen
d3a6db53b3
Update version.inc
2021-08-04 19:57:18 +08:00
Yiqing Liu
891978882a
[TD-5783]<CI>add test for 2.0 branch ( #7153 )
...
* [TD-5783]<CI>add test for 2.0 branch
* fix
* fix
2021-08-04 18:18:34 +08:00
Hui Li
27dc379003
Merge pull request #7131 from taosdata/test/jenkins-m
...
[TD-5733]add time out for crash_gen
2021-08-04 08:31:00 +08:00
Shengliang Guan
cc2440a575
Merge pull request #7126 from taosdata/fix/TD-5537
...
[TD-5537]<fix>: fix mnode write processing's license expired issue
2021-08-03 17:35:25 +08:00
liuyq-617
17277ef64f
prevent zombie taosd
2021-08-03 14:21:53 +08:00
Shuduo Sang
f5a9b37c28
[TD-5702]<fix>: taosdemo remove memory operation. ( #7116 )
...
* [td-5654]<fix>: fix the bug caused by unexpected error code.
* [td-5707]<fix>: fix bug in interp query while only one row exists in a table.
* [TD-5702]<fix>: taosdemo remove memory operation.
* [TD-5702]<fix>: taosdemo remove memory operation.
* add remainderBufLen to check row data generation.
* row data generation with remainder buffer length checking.
Co-authored-by: Haojun Liao <hjliao@taosdata.com>
Co-authored-by: Haojun Liao <hjxilinx@users.noreply.github.com>
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-08-03 14:14:52 +08:00
liuyq-617
419033ff69
[TD-5733]<CI>add timeout for crash_gen
2021-08-03 10:58:39 +08:00
Minglei Jin
f2a36282ba
[TD-5537]<fix>: fix mnode write processing's license expired issue
2021-08-03 10:55:21 +08:00
tomchon
6816c59b2b
change version number
2021-08-02 23:39:53 +08:00
Haojun Liao
5bae5cd2ba
Merge pull request #7108 from taosdata/fix/query
...
[td-5654]<fix>: fix the bug caused by unexpected error code.
2021-08-02 18:55:23 +08:00
Zhiyu Yang
98472086d1
[TD-5614]<hotfix>: handle client and server time not synchronized ( #7109 )
2021-08-02 17:39:31 +08:00
Haojun Liao
8412c93140
Merge pull request #7105 from taosdata/hotfix/TD-5681
...
[TD-5681]<fix>: show queries not work when taosd is rebooted
2021-08-02 15:51:31 +08:00
Haojun Liao
2e9e8434b4
[td-5707]<fix>: fix bug in interp query while only one row exists in a table.
2021-08-02 15:44:28 +08:00
Haojun Liao
f73506be56
[td-5654]<fix>: fix the bug caused by unexpected error code.
2021-08-02 15:32:18 +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
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
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
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
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
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
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
Hui Li
4c2ccf5bb2
Merge pull request #7064 from taosdata/test/jenkins-m
...
revert sani
2021-07-29 18:36:35 +08:00
liuyq-617
eefa3cf5d1
change
2021-07-29 18:17:31 +08:00
liuyq-617
7ae5f04d3e
Empty Commit
2021-07-29 16:41:09 +08:00
liuyq-617
d0b7e937ac
make CI happy
2021-07-29 14:11:09 +08:00
liuyq-617
0c08c44f7a
fix error
2021-07-29 13:49:15 +08:00