Commit Graph

16719 Commits

Author SHA1 Message Date
yihaoDeng 3050211e5c merge develop 2021-07-10 13:58:11 +08:00
yihaoDeng 15f6335e98 merge develop 2021-07-10 11:49:40 +08:00
yihaoDeng 5a7917e69b [TD-5134]<fix> fix runtime error 2021-07-10 11:05:12 +08:00
yihaoDeng 286f95756a Merge branch 'neDev' into t5035 2021-07-10 00:05:37 +08:00
Haojun Liao 8cd41b4c98
Merge pull request #6824 from taosdata/feature/query
[td-225]
2021-07-09 21:52:57 +08:00
shenglian zhou d5ab8d7ced before taos_bind/taos_multi_bind generation 2021-07-09 19:37:15 +08:00
Haojun Liao c9933fd333 [td-225] 2021-07-09 19:16:25 +08:00
Haojun Liao 794549527c
Merge pull request #6818 from taosdata/hotfix/TD-5156
[TD-5156]fix interval issue
2021-07-09 19:12:03 +08:00
bryanchang0603 b2592f3168 Merge branch 'develop' of github.com:taosdata/TDengine into release/ver-2.1.4.1 2021-07-09 17:59:31 +08:00
Shuduo Sang a13206ddbf
Feature/sangshuduo/td 3973 use jemalloc (#6822)
* [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

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-07-09 17:58:08 +08:00
Shuduo Sang 373f1ed483
Hotfix/sangshuduo/td 3973 use jemalloc for master (#6821)
* [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.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-07-09 17:55:40 +08:00
Haojun Liao 5d1c708ca6 [td-225]fix precision problem. 2021-07-09 17:18:01 +08:00
Shuduo Sang edb61e7caf
Hotfix/sangshuduo/td 3973 use jemalloc for master (#6820)
* [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.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-07-09 16:49:21 +08:00
Linhe Huo 66ab17dd58
[TD-4946]<feature>: Node.js connector support nanoseconds (#6817)
* [TD-4946]<feature>: Node.js connector support nanoseconds

* [TD-5166]<feature>: Node.js connector support no host settings
2021-07-09 16:48:32 +08:00
jtcheng e811cb0ad8
[TD-6809]: Fix jdbc NPE (#6814) 2021-07-09 14:12:23 +08:00
wpan 4b9190ab38 fix interval issue 2021-07-09 14:06:49 +08:00
Haojun Liao 73c609f783 Merge branch 'develop' into feature/cenc 2021-07-09 13:25:03 +08:00
Haojun Liao 99aca608a5
Merge pull request #6816 from taosdata/feature/query
[td-5126]<enhance>:improve the nest query performance.
2021-07-09 13:23:30 +08:00
Haojun Liao 03455e6fe9 [td-5126]<enhance>:improve the nest query performance. 2021-07-09 12:19:59 +08:00
shenglian zhou c4f06ca30b develop schemaless 2021-07-09 11:56:58 +08:00
Elias Soong 94d1ac9f98
Merge pull request #6815 from taosdata/docs/Update-Latest-Feature
[TD-4808] <docs>: update Windows specific commands in building & inst…
2021-07-09 11:35:28 +08:00
Elias Soong 1d61e72be3 [TD-4808] <docs>: update Windows specific commands in building & installation. 2021-07-09 11:35:05 +08:00
yihaoDeng b36050cb95 [TD-5134]<fix> fix runtime error 2021-07-09 11:03:09 +08:00
Shuduo Sang a9d577d083
Hotfix/sangshuduo/td 5108 lua support for master (#6813)
* [TD-5108]<feature>: support lua on Windows and Mac

* fix compile warning on mac
2021-07-09 09:48:31 +08:00
yihaoDeng f8df9d40ce [TD-5134]<fix> fix runtime error 2021-07-09 09:25:32 +08:00
yihaoDeng 2b963dc386 [TD-5134]<fix> fix runtime error 2021-07-09 08:49:40 +08:00
tomchon befa257a86 Merge branch 'develop' of github.com:taosdata/TDengine into dev/chr 2021-07-09 02:45:28 +08:00
Shuduo Sang 0e2629dc10
Hotfix/sangshuduo/td 5128 odbc compile failure for master (#6810)
* [TD-5128]<fix>: odbc compile failed.

* fix cmake minimum version complain on mac and windows.

* fix visual studio 2012 build issue.
2021-07-08 23:35:40 +08:00
yihaoDeng c2f32ad9c1 [TD-5134]<fix> fix runtime error 2021-07-08 23:33:12 +08:00
Shuduo Sang 8d1e7a804f
Hotfix/sangshuduo/td 5128 odbc compile failure (#6811)
* [TD-5128]<fix>: odbc compile failed.

* cherry pick from master branch.

* fix visual studio 2012 build issue.
2021-07-08 21:58:30 +08:00
Shuduo Sang 00a02452b2
Feature/sangshuduo/td 5108 lua support on win and mac (#6812)
* [TD-5108]<feature>: support lua on Windows and Mac

* fix compile warning on mac
2021-07-08 21:57:17 +08:00
Haojun Liao 41a30b7ea2 Merge branch 'feature/cenc' of https://github.com/taosdata/TDengine into feature/cenc 2021-07-08 18:31:59 +08:00
Haojun Liao 61e6528957 Merge branch 'develop' into feature/cenc 2021-07-08 18:29:13 +08:00
Haojun Liao d1b4170bf5
Merge pull request #6808 from taosdata/feature/query
Feature/query
2021-07-08 18:26:47 +08:00
Haojun Liao 1da3588491
Merge pull request #6734 from jtcheng/bugfix/self-assignment
[self-assign]: Fix c struct field self-assignment
2021-07-08 16:11:54 +08:00
Haojun Liao c6eea28edc
Merge pull request #6803 from taosdata/hotfix/TD-5101
[TD-5101]fix bool hash issue
2021-07-08 16:11:14 +08:00
Haojun Liao dff88d8be9
Merge pull request #6721 from jtcheng/bugfix/TD-6536
[TD-6536]: Fix memory leak during alter database
2021-07-08 16:10:39 +08:00
Haojun Liao 5be8dc403f
Merge pull request #6773 from taosdata/hotfix/TD-5045
[TD-5045]fix nchar filter issue
2021-07-08 16:09:47 +08:00
Haojun Liao 3184a12967
Merge pull request #6801 from taosdata/fix/TD-4991
[TD-4991]<fix>: fix build failure on MacOS with apple m1 chip (#6688)
2021-07-08 16:09:27 +08:00
Haojun Liao 20ed0ad772
Merge pull request #6787 from taosdata/fix/TD-5056
[TD-5056]<fix> fix input exception
2021-07-08 16:09:02 +08:00
Haojun Liao ab89600ca0
Merge pull request #6790 from taosdata/fix/TD-5035
[TD-5035]<fix> fix empty pointer
2021-07-08 16:08:33 +08:00
Shuduo Sang 1e63299aeb
Revert "[TD-5108]<feature>: CI support lua (#6798)" (#6807)
This reverts commit ad23a6979f.
2021-07-08 15:59:26 +08:00
Shuduo Sang 23f89b505d
[TD-5128]<fix>: odbc compile failed. (#6805) 2021-07-08 15:58:40 +08:00
Haojun Liao 3d7b4e431e [td-225]fix compiler error. 2021-07-08 15:32:17 +08:00
Shuduo Sang 7fdffa08d2
[TD-5128]<fix>: odbc compile failed. (#6804) 2021-07-08 15:21:20 +08:00
Haojun Liao f40ebe0e40 [td-225] fix bug caused by code refactor. 2021-07-08 14:05:56 +08:00
happyguoxy df5f03bbdf [TD-4735]<test>:test nestquery last row function 2021-07-08 13:55:47 +08:00
happyguoxy cbb8642f79 [TD-4735]<test>:test nestquery last row function 2021-07-08 13:55:28 +08:00
wpan 82998b12ba fix bool hash issue 2021-07-08 13:26:58 +08:00
Ganlin Zhao 580d1f75ba [TD-4991]<fix>: fix build failure on MacOS with apple m1 chip (#6688)
* Fix build failure on MacOS with apple m1 chip

* Fix build failure on MacOS with apple m1 chip
2021-07-08 12:08:04 +08:00