8e76b4a6d9
refact dependencies
2021-09-23 11:18:32 +08:00
339d1c1854
refact
2021-09-23 10:59:24 +08:00
7db57d1d50
refact
2021-09-23 10:43:39 +08:00
0406220da5
refact
2021-09-23 10:07:34 +08:00
22e1dc5ce9
refact
2021-09-23 09:48:51 +08:00
3b227a5f73
refact
2021-09-21 21:15:58 +08:00
0a0c5094c7
refact
2021-09-21 20:59:31 +08:00
fba92f9301
add asm notice in cmake
2021-09-07 14:04:52 +08:00
732e2876c9
fix typo
2021-09-07 11:13:07 +08:00
b277d0dcbb
fix typo in cmake
2021-09-07 11:11:36 +08:00
aff4adf71c
Merge from master
2021-08-25 11:51:48 +08:00
ea0a43f54e
Merge from master into develop
2021-08-19 10:42:42 +08:00
13723b04b8
change version number
2021-08-19 10:30:02 +08:00
fa6f3c2fdb
change version number
2021-08-17 11:13:03 +08:00
abff364c1e
change version number
2021-08-16 19:57:56 +08:00
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
f6e953ef4a
Update version.inc
2021-08-04 19:58:04 +08:00
4131915597
Update version.inc
2021-08-04 19:55:45 +08:00
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
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
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
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
8f6b7dace4
drop comment debug test information
2021-07-21 14:56:31 +08:00
a686408917
errTSZ set to blank
2021-07-20 15:50:04 +08:00
c8ecafed59
Set global var VAR_TSZ fixed build error
2021-07-20 15:47:34 +08:00
5810ee65df
remove SZ replace with submodule TSZ
2021-07-19 20:22:34 +08:00
1c7670d9f7
modify release scripts and change version number
2021-07-19 19:40:22 +08:00
bf3078ccef
TSZ support TSZ_IMPL macro to use or not use. remove zlig
2021-07-19 14:13:47 +08:00
dbaaee3365
[td-225]merge develop.
2021-07-16 10:20:42 +08:00
09b58e7e8e
[TD-5259]<fix>: JDBC vulnerable packages. ( #6858 )
2021-07-14 18:32:43 +08:00
5b5b83bb80
merge develop
2021-07-14 18:12:08 +08:00
b2592f3168
Merge branch 'develop' of github.com:taosdata/TDengine into release/ver-2.1.4.1
2021-07-09 17:59:31 +08:00
73c609f783
Merge branch 'develop' into feature/cenc
2021-07-09 13:25:03 +08:00
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
cff7b2395b
compile errro on arm
2021-07-07 18:41:00 +08:00
3c7469de35
[td-225] merge develop.
2021-07-06 23:22:37 +08:00
2510a77f58
Merge branch 'develop' of github.com:taosdata/TDengine into release/ver-2.1.4.1
2021-07-06 14:17:14 +08:00
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
965f55beeb
change version number
2021-07-05 15:43:25 +08:00
f2611d084f
Merge pull request #6705 from taosdata/feature/query
...
Feature/query
2021-07-01 23:11:17 +08:00
f5ae338969
Merge pull request #6687 from bit-hope/develop
...
fix cmake scripts and reduce compile warnings
2021-07-01 23:10:16 +08:00
9b01458bd9
[td-255]fix the bug in recording the elapsed time.
2021-07-01 16:43:09 +08:00
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
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
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
8092ed6633
merge from master
2021-06-24 11:07:27 +08:00
72776ee6ca
Merge pull request #6573 from taosdata/hotfix/tmq
...
[TD-4835] change c++ options
2021-06-24 11:01:30 +08:00
592278a656
fix compile error in test
2021-06-23 23:38:45 +08:00
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
5fa02912f2
Merge from master
2021-06-22 14:53:38 +08:00
25ec36ddd6
[TD-4835] change c++ std option
2021-06-22 14:47:52 +08:00
207481330e
change version number
2021-06-21 17:55:32 +08:00
a2f84ae93c
change version number
2021-06-21 16:34:42 +08:00
97952bff6f
[TD-4696]<fix>: fix the connection multi taosd error within jdbc-restful ( #6499 )
2021-06-16 18:22:51 +08:00
1e92fa7def
sync from develop to master
2021-06-11 17:55:51 +08:00
017299c082
Merge from master
2021-06-09 10:23:11 +08:00
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
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
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
747b88df40
[TD-4507]<fix>: disable jdbc build on windows for appveyor. ( #6353 )
2021-06-03 00:17:48 +08:00
b141d31939
[TD-4507]<fix>: disable jdbc build on windows for appveyor. ( #6352 )
2021-06-02 23:11:44 +08:00
d9f403ad3d
[td-255] merge develop.
2021-06-01 22:45:47 +08:00
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
691eba4782
[td-255]merge develop
2021-05-31 17:09:18 +08:00
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
4729a13ed9
change version number ( #6205 )
...
Co-authored-by: plum-lihui <huili@taosdata.com>
2021-05-23 14:40:29 +08:00
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
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
35e2e015c0
fix compile error on windows
2021-05-18 17:47:36 +08:00
875072a474
Merge from develop
2021-05-18 14:11:01 +08:00
6f6dab4d01
[TD-4198]<feature>: support AddressSanitizer on windows. ( #6132 )
2021-05-15 20:21:16 +08:00
6892a32fe5
[TD-4173]<fix>: compile failed with gcc 4.8.5 on centos7. ( #6111 )
2021-05-13 13:02:35 +08:00
4b3301be83
[td-225] merge develop
2021-05-12 20:01:39 +08:00
ad22414093
Merge from master into develop
2021-05-12 10:07:21 +08:00
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
619a77ccad
TD-4088
2021-05-09 10:25:11 +08:00
ce6aa6d036
TD-4088
2021-05-09 10:04:03 +08:00
15fc9ccb40
TD-4088
2021-05-08 12:07:18 +08:00
4c6f4a140b
change release version
2021-05-03 08:27:36 +08:00
cf9693c528
change release version
2021-05-03 08:27:05 +08:00
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
dc95f7b811
[td-225]merge develop
2021-04-27 16:59:29 +08:00
487b523d1f
[td-225] merge from master
2021-04-25 11:11:36 +08:00
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
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
003e6f4bd1
Merge branch 'develop' into feature/TD-3188
2021-04-20 13:03:37 +08:00
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
aa478e7827
change version ( #5847 )
...
Co-authored-by: plum-lihui <huili@taosdata.com>
2021-04-20 09:31:36 +08:00
b8f6f2653d
[TD-3758]<fix>: fix setnull throw exception when jdbcType is OTHER ( #5797 )
2021-04-13 17:56:25 +08:00
0010927964
add third deps lus
2021-04-07 14:14:57 +08:00
911d89c070
Merge branch 'develop' into feature/TD-3188
2021-04-06 09:53:19 +08:00
af03391f37
support lua script
2021-04-05 11:44:09 +08:00
4e9d4c2b58
change version
2021-04-01 17:24:43 +08:00
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
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
3f726464ea
TD-3246
2021-03-22 11:21:53 +00:00
e6f2fbb82d
change version
2021-03-22 01:17:34 +08:00
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
89a2451af0
Merge pull request #5421 from taosdata/feature/tqueue
...
Feature/tqueue
2021-03-12 09:07:21 +08:00
521113ec0a
Merge remote-tracking branch 'origin/develop' into feature/tqueue
2021-03-10 09:14:31 +08:00
2e7dd60944
change version
2021-03-07 00:35:41 +08:00
ff370c2471
change
2021-03-05 17:05:22 +08:00
32510fa452
TD-3130 for topic module
2021-03-04 17:06:45 +08:00
8f07fc1ba3
[TD-3148] <feature>: make build system detect host arch.
2021-03-03 11:24:45 +08:00
8e65dc0b0f
[TD-3148] <feature>: make build system detect host arch. add other variables.
2021-03-03 02:27:06 +08:00
44c5a28221
[TD-3148] <feature>: make build system detect host arch. detect amd64 and x86
2021-03-03 02:07:45 +08:00
637135539e
[TD-3148] <feature>: make build system detect host arch. detect aarch32
2021-03-03 01:54:53 +08:00
959220bd83
[TD-3148] <feature>: make build system detect host arch. support aarch32
2021-03-03 01:47:51 +08:00
0e98eb8ecd
[TD-3148] <feature>: make build system detect host arch.
2021-03-03 01:36:28 +08:00
b352fc3228
[TD-2868]<feature>: JDBC-RESTful support PreparedStatement and addBatch
2021-02-25 09:45:49 +08:00
66eee02ce3
change version number
2021-02-10 09:21:13 +08:00
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
979c446ecb
change
2021-02-06 17:57:04 +08:00
467fcba39f
[TD-2935]<fix>not set commit id when no git cmd
2021-02-04 16:29:16 +08:00
8e3df07217
[TD-2935]<fix>not set commit id when no git cmd
2021-02-04 16:27:13 +08:00
584b147f1d
Merge branch 'develop' into feature/TD-1925_new
2021-01-27 10:43:16 +08:00
dd3115358a
change
2021-01-26 11:07:23 +08:00
be5e6182df
Merge from develop
2021-01-25 08:23:32 +00:00
80dfa0a47e
TD-2837
2021-01-25 12:54:27 +08:00
39bd90915a
TD-1207 compile error in windows
2021-01-25 11:30:41 +08:00
c96827dcb4
Merge remote-tracking branch 'upstream/develop' into mac
2021-01-23 09:38:28 +08:00
f30a58fd74
Merge branch 'feature/sim' into feature/TD-1925_new
2021-01-21 16:02:31 +08:00
d69ff9f695
Merge pull request #4972 from taosdata/hotfix/test
...
Hotfix/test
2021-01-21 14:04:06 +08:00
b055dd6665
[TD-1077]<fix> add git commit id when make install
2021-01-21 09:59:30 +08:00
57f6b2be3e
Merge branch 'develop' into feature/TD-1925_new
2021-01-21 01:50:08 +00:00
db4502c186
[]cd ..
2021-01-20 16:52:38 +08:00
b33daefe82
[TD-2794]<fix>: fix authentication failed with changed password
2021-01-20 15:00:52 +08:00
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
ddf53cd785
Merge branch 'develop' into feature/TD-1925_new
2021-01-16 23:18:51 +08:00
20d0279971
Merge pull request #4919 from taosdata/test/TD-2695
...
Test/td 2695
2021-01-16 15:08:05 +08:00
6c3e1629e6
change version
2021-01-15 17:39:36 +08:00
ebf3b3a61e
change
2021-01-12 11:31:51 +08:00
e82a6c84d4
Merge branch 'develop' into feature/TD-1925_new
2021-01-06 05:16:29 +00:00
441b97a295
change version number
2021-01-01 23:04:25 +08:00
a7c6e73fb6
Merge branch 'develop' into feature/TD-1925
2020-12-28 11:27:33 +08:00
19ac1515e8
change version
2020-12-26 11:28:18 +08:00
dd459c531a
Merge branch 'develop' into feature/TD-1925
2020-12-21 17:13:45 +08:00
5df39642d8
change version number
2020-12-18 13:49:10 +08:00
1c1bdfd32b
Merge pull request #4562 from taosdata/release/s108
...
Release/s108
2020-12-15 13:02:49 +08:00
547fa46ae7
fix compile errors
2020-12-13 23:29:08 +08:00
ce393e4d2d
add release compile flags
2020-12-13 23:03:13 +08:00
67d25a29ee
TD-1853
2020-12-13 22:23:00 +08:00
102c3989c4
release/s108
2020-12-11 22:32:39 +08:00
9598664f41
Merge from develop
2020-12-09 10:50:18 +08:00
6d9feb0bc4
Merge pull request #4481 from taosdata/hotfix/TD-2364
...
Hotfix/td 2364
2020-12-08 16:42:45 +08:00
97b64d5654
[TD-2364]<fix>: fix mybatis-plus pagenation exceptions
2020-12-08 11:07:11 +08:00
5aef8c57ac
Re implement the TD-1925 code because it cannot merge
2020-12-07 12:57:35 +08:00
c17139097a
Merge from develop
2020-12-06 11:57:05 +00:00
9c194c6eb8
Merge branch 'release/s107' of https://github.com/taosdata/TDengine into release/s107
2020-12-04 17:09:23 +08:00
1e4c61bb26
change jdbc version number
2020-12-04 14:13:40 +08:00
Hongze Cheng
zhaoyanggh
Shengliang Guan
tomchon
Shuduo Sang
Zhiyu Yang
Hui Li
tickduan
Haojun Liao
yihaoDeng
bryanchang0603
zyyang-taosdata
Haojun Liao
Ganlin Zhao
hope
dapan1121
plum-lihui
freemine
stephenkgu