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

252 Commits

Author SHA1 Message Date
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