Commit Graph

893 Commits

Author SHA1 Message Date
yihaoDeng fb4982f8ca merge 3.0 2022-05-22 21:41:55 +08:00
yihaoDeng 5a0e7dfa74 enh: refator index/transport code 2022-05-22 19:58:42 +08:00
Liu Jicong 60c960975d enh: support asan 2022-05-21 16:22:54 +08:00
yihaoDeng 49de494eb8 Merge branch '3.0' of https://github.com/taosdata/TDengine into 3.0 2022-05-21 10:41:06 +08:00
yihaoDeng 9a6710b465 enh: add invert index to vnode 2022-05-20 23:39:52 +08:00
afwerar 28b7f9599e fix(os): disable win compile tests 2022-05-20 16:20:15 +08:00
afwerar 9025abe617 fix(os): disable win compile warning output 2022-05-20 15:14:02 +08:00
afwerar 51721dfc47 fix(os): win run error 2022-05-19 10:37:11 +08:00
Shuduo Sang af51036e43
fix: remove cmake git submodule for3.0 (#12543)
* enh: cmake git submodule

[TD-15342]

* fix: remove git submodule in cmake for 3.0
2022-05-16 16:48:21 +08:00
Hongze Cheng 088ba3090c Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/alter_table 2022-05-14 09:17:07 +00:00
Hongze Cheng 5b518821d7 test BDB 2022-05-14 09:16:57 +00:00
afwerar 5d8c867791 fix(os): make install copy file error 2022-05-14 15:30:11 +08:00
wangmm0220 f6889f4b5f refactor: merge from 3.0 2022-05-11 12:15:29 +08:00
wangmm0220 1ca2148e9a refactor:fix warning in smltest.cpp 2022-05-11 11:54:44 +08:00
afwerar 32e6557353 fix(os): add print trace func. 2022-05-11 01:53:30 +08:00
chenhaoran 647d368109 [test: add cover flag for compile] 2022-05-10 22:20:52 +08:00
afwerar 047a1994b2 fix(os): TDinternal compile error. 2022-05-09 12:08:27 +08:00
afwerar 02e6b38270 fix(os): make taosd run on win. 2022-05-09 03:22:05 +08:00
Shuduo Sang b6b3189fdb
enh: cmake git submodule (#12213)
[TD-15342]
2022-05-07 21:09:21 +08:00
wangmm0220 174bc6a568 refactor:modify schemaless interface 2022-05-07 13:58:10 +08:00
wangmm0220 3ac4beb2ee refactor:add compile option in windows 2022-05-06 21:06:27 +08:00
wangmm0220 05daba7f8e refactor:merge from 3.0 2022-05-06 11:28:34 +08:00
afwerar 402acb60c6 fix(os): fix win max func error. 2022-05-06 09:49:37 +08:00
Shuduo Sang d457f80afc
fix: turn fma off by default (#12114)
[TD-15262]
2022-05-05 15:55:11 +08:00
wangmm0220 4fa52dc6d6 refactor:fix schemaless error & add unit test cases 2022-05-01 22:08:18 +08:00
afwerar cbd39f831f fix(os): switch to JOM compilation. 2022-04-29 20:20:07 +08:00
Xiaoyu Wang 809a78b06e enh: order by primary key optimize 2022-04-24 18:05:28 +08:00
afwerar fc24521621 fix(os): windows compile 3.0. 2022-04-22 09:54:27 +08:00
afwerar 42590a23f4 fix(build): make install. 2022-04-16 17:07:59 +08:00
afwerar 97a373fa17 fix(build): exec output build bin. 2022-04-16 15:12:11 +08:00
afwerar 7b35c455d0 fix(grant): change dongle lib. 2022-04-15 20:12:34 +08:00
plum-lihui a6ac96dd9d [test: add compile option for Address Sanitizer] 2022-04-14 19:49:13 +08:00
afwerar 2b1a544280 fix: grant feature. 2022-04-13 00:42:21 +08:00
afwerar 2662a3b69d [TD-13254]<fix>: make 3.0 grant. 2022-04-10 19:08:16 +08:00
WANG MINGMING 41392e9e4a
Merge branch '3.0' into feature/TD-14422 2022-04-09 10:18:52 +08:00
Liu Jicong 32cc09ae8c remove bdb 2022-04-08 17:52:24 +08:00
wangmm0220 1f8d2ea446 <fix>: fix index map error from table scan to sort output 2022-04-08 14:17:32 +08:00
wangmm0220 78acaed84e fix error in sort logic 2022-04-06 15:44:14 +08:00
wangmm0220 12c3a10a9b fix error in order by logic & fix no return error 2022-04-02 14:29:43 +08:00
afwerar 394178da68 [TD-13767]<fix>: only use iconv. 2022-03-18 13:23:48 +08:00
Shuduo Sang 3c6c518470
[TD-13063]<feature>: 3.0 on windows (#10765)
* [TD-13063]<feature>: 3.0 on Windows

* add pthread in contrib

* fix linux compile

* fix osSemaphore

* add gnu regex for Windows

* fix compile error for Windows

* support arm platform

* port more OS files

* fix for Windows compile

* port more files

* fix macOS on x86_64

* port osFile

* port osSemaphone.h

* port osSocket.c

* port tconfig.c

* port ttimer.c

* add couple files

* merge with 3.0
2022-03-16 11:37:31 +08:00
Shuduo Sang 23bef711fc
Feature/sangshuduo/td 13063 3.0 windows (#10720)
* [TD-13063]<feature>: 3.0 on Windows

* add pthread in contrib

* fix linux compile

* fix osSemaphore

* add gnu regex for Windows

* fix compile error for Windows

* support arm platform

* port more OS files

* fix for Windows compile

* port more files

* fix macOS on x86_64

* port osFile

* port osSemaphone.h

* port osSocket.c

* port tconfig.c

* port ttimer.c

* add couple files
2022-03-15 21:35:04 +08:00
Shuduo Sang ba8d9a798e
Feature/sangshuduo/td 13063 3.0 windows (#10708)
* [TD-13063]<feature>: 3.0 on Windows

* add pthread in contrib

* fix linux compile

* fix osSemaphore

* add gnu regex for Windows

* fix compile error for Windows
2022-03-11 19:39:20 +08:00
Shengliang Guan 35cc1e4841 update version number 2022-03-07 16:42:45 +08:00
yihaoDeng 4c19f56686 fix bug 2022-02-21 00:11:35 +08:00
yihaoDeng adb813f09e test open UV 2022-02-17 21:12:55 +08:00
yihaoDeng 4bb5ba8bd5 test open UV 2022-02-17 20:53:39 +08:00
Liu Jicong 7bbca5e4b5 add tmq reset offset 2022-02-17 19:07:39 +08:00
yihaoDeng 1a543e5605 define BUILD_WITH_UV_TRANS 2022-01-26 15:30:43 +08:00
Hongze Cheng af406ab31a no refact 2022-01-24 02:31:19 +00:00
Hongze Cheng 72ed99e867 more 2022-01-21 06:04:38 +00:00
Hongze Cheng ef53305b47 more 2022-01-21 05:50:10 +00:00
Hongze Cheng 8fcbd64f80 more 2022-01-21 05:49:41 +00:00
Hongze Cheng ac01ea4abb more 2022-01-17 02:36:26 +00:00
yihaoDeng b945000779 add libuv 2022-01-11 23:06:36 +08:00
Minghao Li 31868e951a add traft 2021-12-30 20:55:44 +08:00
Shengliang Guan 1a68c651fc
Merge pull request #9241 from taosdata/feature/3.0_wxy
TD-12194 pull-in cpp-stub
2021-12-21 13:58:44 +08:00
Hongze Cheng d0ea2682b0 integrate libuv 2021-12-20 15:05:01 +08:00
Hongze Cheng dafefe0b6f make compile 2021-12-20 14:44:36 +08:00
Hongze Cheng 8c69a19140 more 2021-12-20 14:01:44 +08:00
Hongze Cheng 6377bab3ab
Merge pull request #9197 from taosdata/feature/3.0_mhli
TD-12278 add craft demo
2021-12-20 11:38:32 +08:00
Xiaoyu Wang 70279eeb3f TD-12194 pull-in cpp-stub 2021-12-19 22:02:08 -05:00
Minghao Li 7b91d47466 add craft demo 2021-12-19 20:05:07 +08:00
yihaoDeng f074a4b3a5 update cache put 2021-12-18 23:06:08 +08:00
yihaoDeng c51780622f adjust index interface 2021-12-18 18:16:07 +08:00
Hongze Cheng 35e5120c96 more 2021-12-08 16:27:56 +08:00
Hongze Cheng 30922ff223 more 2021-12-07 10:08:56 +08:00
Hongze Cheng f2df8dba65 change deps to contrib 2021-12-03 14:31:11 +08:00
Hongze Cheng 4e647ab0c6 disable doc build 2021-12-02 14:21:33 +08:00
Hongze Cheng e2ea6c5158 test integrate SQLite 2021-12-01 17:10:40 +08:00
Hongze Cheng 755bc7a745 integrate sqlite 2021-12-01 15:02:32 +08:00
Hongze Cheng db9aa603ce integrate berkeley db 2021-12-01 13:58:29 +08:00
Hongze Cheng c57e586052 integrate BDB 2021-12-01 13:10:26 +08:00
yihaoDeng 09f3e8e19a merge develop 2021-11-20 16:43:37 +08:00
Hongze Cheng d295531b38 more 2021-11-10 10:27:48 +08:00
Hongze Cheng ef4f731454 refact doxygen generator 2021-11-10 10:00:21 +08:00
Hongze Cheng 9521eca272 refact API documentation 2021-11-10 09:43:59 +08:00
Hongze Cheng 21110e4a6f more 2021-11-09 16:03:15 +08:00
Hongze Cheng da3598f783 more 2021-11-09 16:02:48 +08:00
Hongze Cheng 6568f7ba78 more 2021-11-09 15:27:21 +08:00
Hongze Cheng e08c45ec34 more 2021-11-09 15:20:35 +08:00
Hongze Cheng e26fbd80fd integrate nuraft 2021-11-08 11:43:39 +08:00
Hongze Cheng 45de6cfee0 more 2021-11-02 16:51:20 +08:00
yihaoDeng d4cd3836f1 add lucene 2021-10-21 22:36:17 +08:00
Hongze Cheng b0e9b00548 try lucene 2021-10-18 10:37:53 +08:00
Hongze Cheng 25e569e129 add deps test 2021-10-15 10:27:42 +08:00
Hongze Cheng eef8f49af0 refact 2021-10-14 17:22:59 +08:00
Hongze Cheng b88336d2cd integrate lucene 2021-10-14 16:41:44 +08:00
Hongze Cheng 7ec37add5c supress CMP0048 warning 2021-10-09 13:35:24 +08:00
Hongze Cheng 5fc96f8ccf refact 2021-10-09 10:17:40 +08:00
Hongze Cheng 4e306a79cd use https for deps download 2021-09-30 13:37:52 +08:00
Hongze Cheng eee1fd2fb2 add zlib dependency 2021-09-24 10:47:02 +08:00
Hongze Cheng 8e76b4a6d9 refact dependencies 2021-09-23 11:18:32 +08:00
Hongze Cheng 339d1c1854 refact 2021-09-23 10:59:24 +08:00
Hongze Cheng 7db57d1d50 refact 2021-09-23 10:43:39 +08:00
Hongze Cheng 0406220da5 refact 2021-09-23 10:07:34 +08:00
Hongze Cheng 22e1dc5ce9 refact 2021-09-23 09:48:51 +08:00
Hongze Cheng 3b227a5f73 refact 2021-09-21 21:15:58 +08:00
Hongze Cheng 0a0c5094c7 refact 2021-09-21 20:59:31 +08:00
zhaoyanggh fba92f9301 add asm notice in cmake 2021-09-07 14:04:52 +08:00
zhaoyanggh 732e2876c9 fix typo 2021-09-07 11:13:07 +08:00
zhaoyanggh b277d0dcbb fix typo in cmake 2021-09-07 11:11:36 +08:00
Shengliang Guan aff4adf71c Merge from master 2021-08-25 11:51:48 +08:00
Shengliang Guan ea0a43f54e Merge from master into develop 2021-08-19 10:42:42 +08:00
tomchon 13723b04b8 change version number 2021-08-19 10:30:02 +08:00
tomchon fa6f3c2fdb change version number 2021-08-17 11:13:03 +08:00
tomchon abff364c1e change version number 2021-08-16 19:57:56 +08:00
Shuduo Sang 02f6f5e457
Feature/sangshuduo/td 5844 cmdline parameters align (#7239)
* [TD-5844]<feature>: make cmd line parameter similar.

* fix test case align with taosdemo change.

* fix windows stack overflow issue.

* fix mac compile error.

* fix taosdemo cmdline parameter in tests/pytest/tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoInsert.py

* fix windows compiler options.

* make taos.exe use mysql style password input.

* make taos shell and taosdump use mysql style password input.

* determine scanf return value.
2021-08-15 12:53:34 +08:00
haoranchen f6e953ef4a
Update version.inc 2021-08-04 19:58:04 +08:00
haoranchen 4131915597
Update version.inc 2021-08-04 19:55:45 +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
Zhiyu Yang f734285282
[TD-5506]<hotfix>: fix NullPointerException in JDBC-RESTful (#7021)
* change jdbc version

* [TD-5506]<fix>: throw SQLException in HttpClientPoolUtil
2021-07-27 13:20:35 +08:00
Zhiyu Yang 6f5d540f52
[TD-5489]<fix>: use jdbc specified version number in cmake/CMakeList.… (#6989)
* [TD-5489]<fix>: use jdbc specified version number in cmake/CMakeList.txt and src/connector/jdbc/CMakeList.txt

* change version number in deploy-pom.xml
2021-07-23 17:17:32 +08:00
Hui Li cae52534ff
Merge pull request #6943 from taosdata/release/ver-2.1.5.0
Release/ver 2.1.5.0
2021-07-22 19:46:10 +08:00
tickduan 8f6b7dace4 drop comment debug test information 2021-07-21 14:56:31 +08:00
tickduan a686408917 errTSZ set to blank 2021-07-20 15:50:04 +08:00
tickduan c8ecafed59 Set global var VAR_TSZ fixed build error 2021-07-20 15:47:34 +08:00
tickduan 5810ee65df remove SZ replace with submodule TSZ 2021-07-19 20:22:34 +08:00
tomchon 1c7670d9f7 modify release scripts and change version number 2021-07-19 19:40:22 +08:00
tickduan bf3078ccef TSZ support TSZ_IMPL macro to use or not use. remove zlig 2021-07-19 14:13:47 +08:00
Haojun Liao dbaaee3365 [td-225]merge develop. 2021-07-16 10:20:42 +08:00
Shuduo Sang 09b58e7e8e
[TD-5259]<fix>: JDBC vulnerable packages. (#6858) 2021-07-14 18:32:43 +08:00
yihaoDeng 5b5b83bb80 merge develop 2021-07-14 18:12:08 +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
Haojun Liao 73c609f783 Merge branch 'develop' into feature/cenc 2021-07-09 13:25:03 +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
yihaoDeng cff7b2395b compile errro on arm 2021-07-07 18:41:00 +08:00
Haojun Liao 3c7469de35 [td-225] merge develop. 2021-07-06 23:22:37 +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
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
zyyang-taosdata 965f55beeb change version number 2021-07-05 15:43:25 +08:00
Haojun Liao f2611d084f
Merge pull request #6705 from taosdata/feature/query
Feature/query
2021-07-01 23:11:17 +08:00
Haojun Liao f5ae338969
Merge pull request #6687 from bit-hope/develop
fix cmake scripts and reduce compile warnings
2021-07-01 23:10:16 +08:00
Haojun Liao 9b01458bd9 [td-255]fix the bug in recording the elapsed time. 2021-07-01 16:43:09 +08:00
Ganlin Zhao d80c0c2804
[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-01 09:43:03 +08:00
hope 1978c7729a 1. move gnu compile flags "-pipe -Wshadow" from root "CMakeLists.txt" to "cmake/define.inc"; and change compile flag "/O3" to "/O2", because "/O3" is not supported by MSVC.
2. fix compile warnings in "src/util/src/tbuffer.c", by using "union" to transform integer with float and double.
3. use "memcpy()" instead of directly type convert in "rc/util/src/tutil.c" to resolve memory alignment problem in ARM platform.
4. reduce other compile warnings.
2021-06-30 15:29:42 +08:00
Zhiyu Yang bc2185771c
Hotfix/td 4876 (#6656)
* fix warn mesage in jdbc

* change

* [TD-4876]<fix>: fix getNetworkTimeout and setNetworkTimeout in jdbc driver

* [TD-4117]<test>: remove System.out.println in all jdbc test cases

* change
2021-06-29 09:39:25 +08:00
Shengliang Guan 8092ed6633 merge from master 2021-06-24 11:07:27 +08:00
Shengliang Guan 72776ee6ca
Merge pull request #6573 from taosdata/hotfix/tmq
[TD-4835] change c++ options
2021-06-24 11:01:30 +08:00
Shengliang Guan 592278a656 fix compile error in test 2021-06-23 23:38:45 +08:00
Shuduo Sang cbc60231c5
Hotfix/sangshuduo/td 3973 use jemalloc for master (#6598)
* [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.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-06-23 21:48:47 +08:00
Shengliang Guan 5fa02912f2 Merge from master 2021-06-22 14:53:38 +08:00
Shengliang Guan 25ec36ddd6 [TD-4835] change c++ std option 2021-06-22 14:47:52 +08:00
zyyang-taosdata 207481330e change version number 2021-06-21 17:55:32 +08:00
zyyang-taosdata a2f84ae93c change version number 2021-06-21 16:34:42 +08:00
zyyang 97952bff6f
[TD-4696]<fix>: fix the connection multi taosd error within jdbc-restful (#6499) 2021-06-16 18:22:51 +08:00
zyyang 1e92fa7def sync from develop to master 2021-06-11 17:55:51 +08:00
Shengliang Guan 017299c082 Merge from master 2021-06-09 10:23:11 +08:00
Shuduo Sang dc3de5dae0
Feature/sangshuduo/td 4198 support address sanitizer (#6419)
* cherry pick from develop branch.

* cherry pick from develop branch.

* add static lib link.
2021-06-09 06:51:29 +08:00
Shuduo Sang db251e8e41
Feature/sangshuduo/td 4198 support address sanitizer for develop (#6414)
* [TD-4198]<feature>: support AddressSanitizer on windows.

* fix compile flag.

* fix compile warning for early version visual c++.

* disable memory sanitizer by default.

* fix variable name

* add static lib link.
2021-06-09 06:51:14 +08:00
zyyang 04f1ffad9b
[TD-4480]<fix>: fix DatabaseMetaData get wrong column value (#6381)
* [TD-4480]<fix>: fix DatabaseMetaData has wrong column index bug

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change test cases

* change test cases

* change

* change

* change

* change

* change

* change jdbc version

* change

* change

* change

* change

* change

* change

* change

* change
2021-06-07 14:14:06 +08:00
Shuduo Sang 747b88df40
[TD-4507]<fix>: disable jdbc build on windows for appveyor. (#6353) 2021-06-03 00:17:48 +08:00
Shuduo Sang b141d31939
[TD-4507]<fix>: disable jdbc build on windows for appveyor. (#6352) 2021-06-02 23:11:44 +08:00
Haojun Liao d9f403ad3d [td-255] merge develop. 2021-06-01 22:45:47 +08:00
Shuduo Sang 09c4c28169
Feature/sangshuduo/td 3973 use jemalloc (#6319)
* [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.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-06-01 13:34:03 +08:00
Haojun Liao 691eba4782 [td-255]merge develop 2021-05-31 17:09:18 +08:00
zyyang 5772028d6e
change version number (#6204)https://github.com/taosdata/TDengine/tree/release/ver-2.0.20.5
Co-authored-by: plum-lihui <huili@taosdata.com>
2021-05-24 11:45:23 +08:00
zyyang 4729a13ed9
change version number (#6205)
Co-authored-by: plum-lihui <huili@taosdata.com>
2021-05-23 14:40:29 +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
yihaoDeng 35e2e015c0 fix compile error on windows 2021-05-18 17:47:36 +08:00
Shengliang Guan 875072a474 Merge from develop 2021-05-18 14:11:01 +08:00
Shuduo Sang 6f6dab4d01
[TD-4198]<feature>: support AddressSanitizer on windows. (#6132) 2021-05-15 20:21:16 +08:00
Shuduo Sang 6892a32fe5
[TD-4173]<fix>: compile failed with gcc 4.8.5 on centos7. (#6111) 2021-05-13 13:02:35 +08:00
Haojun Liao 4b3301be83 [td-225] merge develop 2021-05-12 20:01:39 +08:00
Shengliang Guan ad22414093 Merge from master into develop 2021-05-12 10:07:21 +08:00
zyyang 5131e7b12a
Fix/td 3986 (#6088)
* [TD-3986]<fix>: fix subscribe test case error

* change jdbc version number
2021-05-12 09:41:03 +08:00
Shengliang Guan 619a77ccad TD-4088 2021-05-09 10:25:11 +08:00
Shengliang Guan ce6aa6d036 TD-4088 2021-05-09 10:04:03 +08:00
Shengliang Guan 15fc9ccb40 TD-4088 2021-05-08 12:07:18 +08:00
zyyang 4c6f4a140b change release version 2021-05-03 08:27:36 +08:00
zyyang cf9693c528 change release version 2021-05-03 08:27:05 +08:00
zyyang 5eac06b287
merge taos-jdbcdriver-2.0.28 all changes to master branch (#5974)
* merge taos-jdbcdriver-2.0.28 all changes to master branch

* change version in cmake/install.inc
2021-04-30 11:41:24 +08:00
Haojun Liao dc95f7b811 [td-225]merge develop 2021-04-27 16:59:29 +08:00
Haojun Liao 487b523d1f [td-225] merge from master 2021-04-25 11:11:36 +08:00
Shuduo Sang beb7f55f29
[TD-3913]<fix>: mips compile support. (#5894)
* [TD-3913]<fix>: mips compile support.

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

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

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
2021-04-23 10:56:50 +08:00
zyyang 490b34c5d9
Hotfix/td 3841 (#5892)
* [TD-3841]<fix>: getFloat methed get 0 when data value is null

* change jdbc driver version number

* change

* [TD-3841]<test>: test Mybatis query null value

* change
2021-04-23 09:56:40 +08:00
dapan1121 003e6f4bd1 Merge branch 'develop' into feature/TD-3188 2021-04-20 13:03:37 +08:00
zyyang c3dc60e8fc
Release/s120 (#5846)
* change version

* change jdbc version

* [TD-3796]<test>: test null value in JDBC-JNI

Co-authored-by: plum-lihui <huili@taosdata.com>
2021-04-20 09:32:53 +08:00
zyyang aa478e7827
change version (#5847)
Co-authored-by: plum-lihui <huili@taosdata.com>
2021-04-20 09:31:36 +08:00
zyyang b8f6f2653d
[TD-3758]<fix>: fix setnull throw exception when jdbcType is OTHER (#5797) 2021-04-13 17:56:25 +08:00
yihaoDeng 0010927964 add third deps lus 2021-04-07 14:14:57 +08:00
dapan1121 911d89c070 Merge branch 'develop' into feature/TD-3188 2021-04-06 09:53:19 +08:00
yihaoDeng af03391f37 support lua script 2021-04-05 11:44:09 +08:00
zyyang-taosdata 4e9d4c2b58 change version 2021-04-01 17:24:43 +08:00
zyyang 598b1ce6bf
Feature/td 3411 (#5648)
* [TD-3410]feature: adapted to nutz

* change

* change

* change

* change

* [TD-3447]<feature>: JDBC-RESTful and JDBC-JNI support setObject

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* [TD-3548]<feature>: support ParameterMetaData in JDBC-RESTful and JDBC-JNI

* change

* change

* [TD-3446]<feature>: JDBC-JNI and JDBC-RESTful do not need invoke Class.forName any more

* change jdbc version

* change

* change

* change

* change

* change

* change

* change

* change

* change version
2021-04-01 15:16:36 +08:00
zyyang d2ec29715a
[TD-3410]<feature>: support nutz framework (#5600)
* [TD-3410]feature: adapted to nutz

* change

* change

* change

* change

* [TD-3447]<feature>: JDBC-RESTful and JDBC-JNI support setObject

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* [TD-3548]<feature>: support ParameterMetaData in JDBC-RESTful and JDBC-JNI

* change

* change

* [TD-3446]<feature>: JDBC-JNI and JDBC-RESTful do not need invoke Class.forName any more

* change jdbc version

* change

* change

* change
2021-03-29 14:42:49 +08:00
Shengliang Guan 3f726464ea TD-3246 2021-03-22 11:21:53 +00:00
plum-lihui e6f2fbb82d change version 2021-03-22 01:17:34 +08:00
zyyang ac5d5316ac
[TD-3082]<feature>: jdbc connector support unsigned tinyint, smallint, int, bigint (#5447)
* [TD-3082]<feature>: support unsigned number in JDBC connector

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change

* change version

* change

* change
2021-03-16 13:44:09 +08:00
Shengliang Guan 89a2451af0
Merge pull request #5421 from taosdata/feature/tqueue
Feature/tqueue
2021-03-12 09:07:21 +08:00
Shengliang Guan 521113ec0a Merge remote-tracking branch 'origin/develop' into feature/tqueue 2021-03-10 09:14:31 +08:00
plum-lihui 2e7dd60944 change version 2021-03-07 00:35:41 +08:00
zyyang ff370c2471 change 2021-03-05 17:05:22 +08:00
Shengliang Guan 32510fa452 TD-3130 for topic module 2021-03-04 17:06:45 +08:00
Shuduo Sang 8f07fc1ba3 [TD-3148] <feature>: make build system detect host arch. 2021-03-03 11:24:45 +08:00
Shuduo Sang 8e65dc0b0f [TD-3148] <feature>: make build system detect host arch. add other variables. 2021-03-03 02:27:06 +08:00
Shuduo Sang 44c5a28221 [TD-3148] <feature>: make build system detect host arch. detect amd64 and x86 2021-03-03 02:07:45 +08:00
Shuduo Sang 637135539e [TD-3148] <feature>: make build system detect host arch. detect aarch32 2021-03-03 01:54:53 +08:00
Shuduo Sang 959220bd83 [TD-3148] <feature>: make build system detect host arch. support aarch32 2021-03-03 01:47:51 +08:00
Shuduo Sang 0e98eb8ecd [TD-3148] <feature>: make build system detect host arch. 2021-03-03 01:36:28 +08:00
zyyang b352fc3228 [TD-2868]<feature>: JDBC-RESTful support PreparedStatement and addBatch 2021-02-25 09:45:49 +08:00
plum-lihui 66eee02ce3 change version number 2021-02-10 09:21:13 +08:00
huili cf983f8c1c
Merge pull request #5177 from taosdata/feature/TD-2005
[TD-2005]<feature>: add Error Number for jdbc driver errors
2021-02-06 18:39:57 +08:00
zyyang 979c446ecb change 2021-02-06 17:57:04 +08:00
Hui Li 467fcba39f [TD-2935]<fix>not set commit id when no git cmd 2021-02-04 16:29:16 +08:00
Hui Li 8e3df07217 [TD-2935]<fix>not set commit id when no git cmd 2021-02-04 16:27:13 +08:00
Hongze Cheng 584b147f1d Merge branch 'develop' into feature/TD-1925_new 2021-01-27 10:43:16 +08:00
zyyang dd3115358a change 2021-01-26 11:07:23 +08:00
Shengliang Guan be5e6182df Merge from develop 2021-01-25 08:23:32 +00:00
Shengliang Guan 80dfa0a47e TD-2837 2021-01-25 12:54:27 +08:00
Shengliang Guan 39bd90915a TD-1207 compile error in windows 2021-01-25 11:30:41 +08:00
freemine c96827dcb4 Merge remote-tracking branch 'upstream/develop' into mac 2021-01-23 09:38:28 +08:00
Hongze Cheng f30a58fd74 Merge branch 'feature/sim' into feature/TD-1925_new 2021-01-21 16:02:31 +08:00
huili d69ff9f695
Merge pull request #4972 from taosdata/hotfix/test
Hotfix/test
2021-01-21 14:04:06 +08:00
Hui Li b055dd6665 [TD-1077]<fix> add git commit id when make install 2021-01-21 09:59:30 +08:00
Hongze Cheng 57f6b2be3e Merge branch 'develop' into feature/TD-1925_new 2021-01-21 01:50:08 +00:00
Hui Li db4502c186 []cd .. 2021-01-20 16:52:38 +08:00
zyyang b33daefe82 [TD-2794]<fix>: fix authentication failed with changed password 2021-01-20 15:00:52 +08:00
freemine 0c96f7653e 1. bugfix: eok.c: array of pointers rather than POD buffer
2. initial port of taosd for MacOSX
2021-01-17 21:40:39 +08:00
Hongze Cheng ddf53cd785 Merge branch 'develop' into feature/TD-1925_new 2021-01-16 23:18:51 +08:00
huili 20d0279971
Merge pull request #4919 from taosdata/test/TD-2695
Test/td 2695
2021-01-16 15:08:05 +08:00
plum-lihui 6c3e1629e6 change version 2021-01-15 17:39:36 +08:00
zyyang ebf3b3a61e change 2021-01-12 11:31:51 +08:00
Hongze Cheng e82a6c84d4 Merge branch 'develop' into feature/TD-1925_new 2021-01-06 05:16:29 +00:00
plum-lihui 441b97a295 change version number 2021-01-01 23:04:25 +08:00
Hongze Cheng a7c6e73fb6 Merge branch 'develop' into feature/TD-1925 2020-12-28 11:27:33 +08:00
plum-lihui 19ac1515e8 change version 2020-12-26 11:28:18 +08:00
Hongze Cheng dd459c531a Merge branch 'develop' into feature/TD-1925 2020-12-21 17:13:45 +08:00
plum-lihui 5df39642d8 change version number 2020-12-18 13:49:10 +08:00
huili 1c1bdfd32b
Merge pull request #4562 from taosdata/release/s108
Release/s108
2020-12-15 13:02:49 +08:00
Shengliang Guan 547fa46ae7 fix compile errors 2020-12-13 23:29:08 +08:00
Shengliang Guan ce393e4d2d add release compile flags 2020-12-13 23:03:13 +08:00
Shengliang Guan 67d25a29ee TD-1853 2020-12-13 22:23:00 +08:00
plum-lihui 102c3989c4 release/s108 2020-12-11 22:32:39 +08:00
Shengliang Guan 9598664f41 Merge from develop 2020-12-09 10:50:18 +08:00
huili 6d9feb0bc4
Merge pull request #4481 from taosdata/hotfix/TD-2364
Hotfix/td 2364
2020-12-08 16:42:45 +08:00
zyyang 97b64d5654 [TD-2364]<fix>: fix mybatis-plus pagenation exceptions 2020-12-08 11:07:11 +08:00
Shengliang Guan 5aef8c57ac Re implement the TD-1925 code because it cannot merge 2020-12-07 12:57:35 +08:00
Shengliang Guan c17139097a Merge from develop 2020-12-06 11:57:05 +00:00
stephenkgu 9c194c6eb8 Merge branch 'release/s107' of https://github.com/taosdata/TDengine into release/s107 2020-12-04 17:09:23 +08:00
zyyang 1e4c61bb26 change jdbc version number 2020-12-04 14:13:40 +08:00
plum-lihui 030fc35958 change version number 2020-12-04 13:48:14 +08:00
Shengliang Guan 6507ac3c39 TD-1207 2020-12-01 14:54:46 +08:00
Hongze Cheng 540d42452d Merge branch 'develop' into feature/TD-1413 2020-11-26 16:09:51 +08:00
huili b2aadbb896
Merge pull request #4323 from taosdata/feature/TD-1859
Feature/td 1859
2020-11-25 17:54:42 +08:00
Hongze Cheng f68b434356 Merge branch 'develop' into feature/TD-1413 2020-11-24 05:07:34 +00:00
zyyang 5e91e8e307 change 2020-11-23 19:28:45 +08:00
plum-lihui 30e18f31b7 change version number 2020-11-20 20:08:41 +08:00
Hongze Cheng 35ead50063 Merge branch 'develop' into feature/TD-1413 2020-11-19 08:53:18 +00:00
huili b4e8f00a4c
Merge pull request #3981 from freemine/odbc
odbc connector, keep going
2020-11-19 14:49:22 +08:00
Hongze Cheng de1a75f64d Merge branch 'develop' into feature/TD-1413 2020-11-18 10:17:18 +08:00
zyyang 5a207951ec change version 2020-11-14 10:33:46 +08:00
Hui Li 86625df80a [none] 2020-11-11 15:26:59 +08:00
Hui Li 031ab3b737 [2028]<feature> add C# connector for windows 2020-11-10 17:19:14 +08:00
freemine 546e7d8584 odbc install directive moves into odbc-sub-module; client_to_env when SQL_CHAR in SQLExecDirect 2020-10-31 16:24:59 +08:00
freemine 32b3c2e65e install ODBC driver components if only flex was found 2020-10-31 00:43:07 +08:00
freemine cc496e12bb add todbcinst to help user install/uninstall taos odbc driver 2020-10-28 13:47:32 +08:00
Hongze Cheng 95da7b8bd6 Merge branch 'develop' into feature/TD-1413 2020-10-24 03:03:11 +00:00
Hui Li f830a04240 change version number 2020-10-23 09:25:07 +08:00
Shengliang Guan 44963201ab TD-1767 2020-10-22 06:28:44 +00:00
Hongze Cheng e19a3eaf78 more code 2020-10-21 09:12:54 +00:00
Hongze Cheng 8aece18577 Merge branch 'develop' into feature/TD-1413 2020-10-20 21:37:57 +08:00
zyyang 84757a2412 update jdbc driver version 2020-10-20 13:00:41 +08:00
Hongze Cheng 82baff2528 more code 2020-10-20 02:41:47 +00:00
Shengliang Guan efec15d267 compiled error in wn32 2020-10-15 13:59:08 +08:00
Hui Li aed51263c8 package taoserror.h into windows client 2020-10-14 14:28:49 +08:00
Hui Li f01c0e7630 update the version.inc 2020-10-12 17:57:32 +08:00
Hui Li c1d31e5e25 release/s103 2020-10-10 20:09:00 +08:00
Shengliang Guan 5f97a7b400 TD-1530 2020-09-29 13:43:17 +08:00
Shengliang Guan 05687d1eba TD-1530 minor changes 2020-09-28 22:30:34 +08:00
Shengliang Guan e32e507e1f TD-1530 2020-09-28 14:29:23 +08:00
Shengliang Guan 2811c96b30 TD-1530 2020-09-28 10:29:49 +08:00
Shengliang Guan 16969d0d88 Merge remote-tracking branch 'origin/develop' into feature/os 2020-09-27 07:12:22 +00:00
Hui Li 1f4d0b0c13 [TD-1465] 2020-09-27 13:28:37 +08:00
Shengliang Guan fb064f5337 minor changes 2020-09-22 10:52:43 +00:00
Hui Li d10a3cdd11 [update version info] 2020-09-22 15:28:12 +08:00
Shuduo Sang e7099d5518 add void cast to solve unused variables. 2020-09-16 11:02:36 +08:00
Shuduo Sang af08259379 Merge branch 'develop' into hotfix/sangshuduo/fix-compile-error-for-release 2020-09-16 11:00:22 +08:00
Shuduo Sang ab198e6fd7 disable warning for self assign. 2020-09-16 10:47:47 +08:00
Shuduo Sang e544363106 [TD-1459] <fix>: fix compile error for release build type. 2020-09-15 18:56:32 +08:00
Hui Li 53c4f51116 [TD-1427] 2020-09-15 18:21:40 +08:00
root 07b38c1cac Merge remote-tracking branch 'origin/develop' into feature/mqtt 2020-09-07 11:24:24 +08:00
Hui Li eb9a1f9655 [issue:3375] 2020-09-05 12:58:36 +08:00
Shengliang Guan 59966c953b
Merge pull request #3389 from taosdata/release/s101
Release/s101
2020-09-05 11:25:55 +08:00
Hui Li 563a90f46a update the version 2020-09-05 10:57:38 +08:00
Shengliang Guan fb9c2f4eff minor changes 2020-09-05 02:27:27 +00:00
Shengliang Guan 6aa2db02bb Merge from develop 2020-09-05 02:22:15 +00:00
Hongze Cheng 7f56ba6056 TD-1027 2020-09-04 15:09:04 +08:00
Shengliang Guan 011ca825f9 TD-1310 Refactor the mqtt module codes 2020-09-03 14:29:40 +00:00
Shengliang Guan d75ce1715e TD-1310 2020-09-02 10:52:32 +00:00
Hui Li 72199cacdf [TD-1305] 2020-09-02 13:19:16 +08:00
Hui Li 5ab467451d [modify taosc name for oem power] 2020-09-01 15:19:20 +08:00
Hui Li 8f57775923 [modify oem macro define] 2020-08-31 11:34:55 +08:00
Hui Li 2aa54b4ec7 [TD-1228] 2020-08-29 16:04:41 +08:00
Hui Li 57ec385903 [TD-1228] 2020-08-29 15:45:02 +08:00
Shengliang Guan 2420c8c5c6 minor changes 2020-08-28 15:48:03 +08:00
Hui Li 89744f4ba8 [release version modify] 2020-08-28 13:00:53 +08:00
Shengliang Guan dd1278c6f9 TD-1090 remove version.c and add version to taos.dll 2020-08-26 19:08:07 +08:00
Shengliang Guan 2f76b8c276
Merge pull request #3196 from taosdata/master
Master
2020-08-23 20:11:08 +08:00
Hui Li 5682851c4e [TD-1048] 2020-08-22 15:46:22 +08:00
Shengliang Guan 169a17bcb3 Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-20 13:40:04 +00:00
Hui Li 94c11e0f67 [TD-1162] 2020-08-20 16:37:35 +08:00
Shengliang Guan e53ebe94df TD-1090 compile client in windows 32 platform 2020-08-20 16:27:44 +08:00
Shengliang Guan 6ff0bb47ea TD-1090 2020-08-19 09:58:05 +08:00
Shengliang Guan 22cb8287b5 TD-1047 minor changes for libiconv 2020-08-15 14:29:35 +08:00
Shengliang Guan 6143e72b1c TD-1047 iconv compile options 2020-08-15 14:20:20 +08:00
Shengliang Guan bd6f9ee918 TD-1047 change some definitions in arm64 platform 2020-08-13 00:17:48 +08:00
Shengliang Guan e826a65dc8 TD-1047 undefine linux64 while cputype is aarch64 2020-08-12 22:48:28 +08:00
Shengliang Guan eae5bbda27 not install some files in windows 2020-08-12 17:37:53 +08:00
Shengliang Guan ed896f976b TD-1057 2020-08-08 13:14:12 +08:00
Shengliang Guan d593a90581 Merge branch 'develop' into feature/os 2020-08-08 09:39:24 +08:00
Shengliang Guan ef2f966da5 TD-1057 2020-08-07 18:59:52 +08:00
Shengliang Guan c9f221d04b minor compile errors 2020-08-07 16:11:01 +08:00
Shengliang Guan 5ede107b94 minor changes for cmake 2020-08-07 15:54:51 +08:00
Shengliang Guan f956c90b59 TD-1057 2020-08-05 04:30:04 +00:00
Shengliang Guan acdb8dcac2 TD-1057 2020-08-05 11:29:48 +08:00
Shengliang Guan 09da8164f1 yml 2020-08-01 03:13:11 +00:00
Shengliang Guan a9d963e229 remove compile options malign 2020-08-01 03:00:21 +00:00
Shengliang Guan 4200bf01f9 compile options 2020-08-01 02:49:40 +00:00
Shengliang Guan ea640ac08d compile options 2020-08-01 02:49:04 +00:00
Shengliang Guan 700df6a071 change cmake option 2020-08-01 02:25:43 +00:00
Shengliang Guan 592b71484d [TD-992] 2020-07-31 23:44:23 +08:00
slguan d012c3eb8e [TD-992] cmake file for darwin 2020-07-30 18:44:29 +08:00
Shengliang Guan d39a3320ee [TD-992] adjust cmake files 2020-07-28 08:58:00 +00:00
Shengliang Guan 276fb37099 [TD-992] refactor codes 2020-07-28 02:59:54 +00:00
Shuduo Sang 2976b629b2 emulate network read/write random failure.
[TD-791]
2020-07-05 18:06:13 +08:00
Shuduo Sang 1405d825be emulate file operation random fail.
[TD-792]
2020-07-04 17:45:38 +08:00
hjxilinx d78d7886ed [td-171] remove a macro definition 2020-04-23 18:27:33 +08:00
hjxilinx 82241b3725 [td-171] fix bugs in time filter in super table query. 2020-04-23 17:44:36 +08:00
slguan 0732786632 [TD-52] refactor interface 2020-04-17 12:18:28 +08:00
slguan fd6234b00f Merge branch 'feature/mpeer' into develop 2020-04-17 00:09:02 +08:00
slguan 0f202d9fc4 rearrage some codes 2020-04-16 18:57:13 +08:00
slguan 8cf8f8f8fe Merge pull request #1618 from taosdata/feature/mpeer
Feature/mpeer
2020-04-16 11:34:38 +08:00
slguan 78f7134ef1 [TD-52] rename some defs 2020-04-11 00:09:37 +08:00
Shuduo Sang 77c6f616f9 add compile flag to treat all warnings as errors.
[TD-118]
2020-04-07 14:39:31 +08:00
slguan c06fb4d927 [TD-17] add show mnodes command in cluster version 2020-04-02 17:50:02 +08:00
slguan 61b2342b05 [TD-17] fix error while alloc vnodes 2020-04-02 11:00:00 +08:00
hzcheng 69f7437e52 TD-34 2020-03-31 11:46:18 +08:00
slguan 86e4ebcd83 [TD-17] make cluster can be compiled 2020-03-30 17:27:01 +08:00
slguan 0f331d2ddf [TD-58] change cmake files 2020-03-29 18:07:08 +08:00
slguan f1f30749e2 [TD-63] 2020-03-27 15:06:20 +08:00
slguan 0d4852ca0e [TD-58] 2020-03-27 00:26:08 +08:00