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

16719 Commits

Author SHA1 Message Date
yihaoDeng 12bd5e2700 merge develop 2021-07-07 06:01:22 +08:00
yihaoDeng d805b283ea merge develop 2021-07-07 05:50:07 +08:00
yihaoDeng ec1ee6db19 merge develop 2021-07-07 05:42:04 +08:00
yihaoDeng 1b62c9b4e2 merge develop 2021-07-07 05:30:03 +08:00
wpan 93eafbb759 Merge branch 'feature/cenc' of github.com:taosdata/TDengine into feature/cenc 2021-07-07 11:05:37 +08:00
wpan e5ac66a88b fix meta error 2021-07-07 11:05:05 +08:00
Haojun Liao 6a2e7f7de2 [td-225] merge develop. 2021-07-07 10:29:08 +08:00
tomchon cd95ff5d28 Merge branch 'release/ver-2.1.4.1' of github.com:taosdata/TDengine into release/ver-2.1.4.1 2021-07-06 17:52:26 +00:00
tomchon a7a38aece7 modify release scripts of docker-building 2021-07-06 17:50:49 +00:00
yihaoDeng fd16f43e40 Merge branch 'develop' of github.com:taosdata/TDengine into devx 2021-07-07 00:05:09 +08:00
Haojun Liao e7a6dae6e9 [td-225] merge develop. 2021-07-06 23:44:35 +08:00
Haojun Liao 7a37f750c3 [td-225] merge develop. 2021-07-06 23:26:17 +08:00
Haojun Liao 1a8164084a [td-225] merge develop. 2021-07-06 23:24:15 +08:00
Haojun Liao 74bc74d608 [td-225] merge develop. 2021-07-06 23:23:30 +08:00
Haojun Liao 3c7469de35 [td-225] merge develop. 2021-07-06 23:22:37 +08:00
tomchon 1f6715c0a5 Merge branch 'develop' of github.com:taosdata/TDengine into release/ver-2.1.4.1 2021-07-06 19:34:27 +08:00
Shuduo Sang 7c869c765a
Feature/sangshuduo/td 3973 use jemalloc (#6767) 
* [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.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-07-06 19:32:21 +08:00
Shuduo Sang ad7a59d759
Hotfix/sangshuduo/td 3973 use jemalloc for master (#6768) 
* [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.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-07-06 19:32:07 +08:00
Haojun Liao f8c3135f8c [td-255] refactor. 2021-07-06 18:47:07 +08:00
tomchon 24a56eb1c7 Merge branch 'release/ver-2.1.4.1' of github.com:taosdata/TDengine into release/ver-2.1.4.1 2021-07-06 18:40:41 +08:00
Shuduo Sang 833c94b88e
[TD-5067]<fix>: taosdemo stmt use sample data (#6760) 2021-07-06 18:39:17 +08:00
tomchon 0e0495832a Merge branch 'develop' of github.com:taosdata/TDengine into release/ver-2.1.4.1 2021-07-06 18:33:00 +08:00
Shuduo Sang 7d9efc95a2
Feature/sangshuduo/td 3973 use jemalloc (#6766) 
* [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.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-07-06 18:31:38 +08:00
Shuduo Sang 1d25f5f6be
Hotfix/sangshuduo/td 3973 use jemalloc for master (#6765) 
* [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.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-07-06 18:30:52 +08:00
Ping Xiao d93c482860 [TD-5078]<test>: update test case for nested query 2021-07-06 18:28:45 +08:00
tomchon d4632f740d Merge branch 'develop' of github.com:taosdata/TDengine into release/ver-2.1.4.1 2021-07-06 18:01:35 +08:00
Shuduo Sang c7a1fd0a26
Hotfix/sangshuduo/td 3973 use jemalloc for master (#6763) 
* [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.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-07-06 18:00:20 +08:00
Shuduo Sang 7a80bf0417
Feature/sangshuduo/td 3973 use jemalloc (#6762) 
* [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.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-07-06 17:59:51 +08:00
Shuduo Sang d53b734901
[TD-5067]<fix>: taosdemo stmt use sample data (#6759) 2021-07-06 17:59:39 +08:00
Haojun Liao 2bf253d336
Merge pull request #6744 from taosdata/hotfix/TD-5042 
[TD-5042]fix diff group by crash issue
 2021-07-06 14:51:11 +08:00
Haojun Liao 332c397f43
Merge pull request #6749 from taosdata/hotfix/TD-5043 
[TD-5043]fix offset issue
 2021-07-06 14:50:55 +08:00
Haojun Liao 37a81dfac6
Merge pull request #6699 from taosdata/fix/TD-4947 
[TD-4947]<fix> handle mixed group by with top/bottom corrupt
 2021-07-06 14:50:40 +08:00
Haojun Liao a3848a14f5 [td-255] refactor. 2021-07-06 14:48:26 +08:00
zyyang-taosdata 2510a77f58 Merge branch 'develop' of github.com:taosdata/TDengine into release/ver-2.1.4.1 2021-07-06 14:17:14 +08:00
Shuduo Sang 95b0cee27b
[TD-5053]<feature>: taosdump support nanosecond (#6751) 
* [TD-5053]<feature>: taosdump support nanosecond

huge code refactoring

* fix arm32 compile issue.
 2021-07-06 14:07:52 +08:00
Elias Soong 4bb8553cc2
Merge pull request #6754 from taosdata/docs/Update-Latest-Feature 
Docs/update latest feature
 2021-07-06 13:27:38 +08:00
Elias Soong 6da6c97053 [TD-5072] <docs>: describe detail about table name wildcard. 2021-07-06 13:26:59 +08:00
Shuduo Sang 8868d44773
Feature/sangshuduo/td 3973 use jemalloc (#6752) 
* [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.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-07-06 12:37:55 +08:00
Shuduo Sang c9c6a92569
Hotfix/sangshuduo/td 3973 use jemalloc for master (#6753) 
* [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.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
 2021-07-06 12:37:39 +08:00
wpan beff12c7ba fix bug issue 2021-07-06 11:47:18 +08:00
Huo Linhe 5857613b9c [TD-5014]<feature>: support timeshift in grafana plugin 2021-07-06 11:17:50 +08:00
wpan 06f38b5b1c add group by condition check 2021-07-06 10:53:30 +08:00
Hui Li c14b74ef58
Merge pull request #6738 from taosdata/test/TD-4985-m 
Test/td 4985 m
 2021-07-06 10:11:57 +08:00
Hui Li ceeddfaadc
Merge pull request #6741 from taosdata/test/TD-4899 
add manual test case of subscription with no result file defined
 2021-07-06 10:11:50 +08:00
Hui Li 0834f2539d
Merge pull request #6748 from taosdata/xiaoping/add_test_case 
[TD-4983]<test>: add test case for interval boundary
 2021-07-06 10:11:42 +08:00
Zhiyu Yang a657f4529b
add tq release packagine scripts (#6739) 
* change version number

* change packaging scripts

* add more scripts

* change scripts

* change

* change

* change

Co-authored-by: plum-lihui <huili@taosdata.com>
 2021-07-06 09:23:05 +08:00
wpan 3fad481995 fix offset issue 2021-07-06 09:06:36 +08:00
bryanchang0603 d2b4f31a32 Merge branch 'release/ver-2.1.4.1' of github.com:taosdata/TDengine into release/ver-2.1.4.1 2021-07-06 02:30:14 +08:00
bryanchang0603 32d8dd7979 modify release.sh 2021-07-06 02:27:49 +08:00
zyyang-taosdata 48db99a7e9 modify alert release'scripts 2021-07-05 22:58:20 +08:00