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

207 Commits

Author SHA1 Message Date
tickduan 124cbfde9d merge develop add sz_size_type==4 2021-07-04 12:25:02 +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
tickduan c0e3c29cde Merge branch 'develop' into compress_float 2021-06-29 14:02:30 +08:00
tickduan d94ffca301 with -w build success 2021-06-29 14:01:01 +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
tickduan a09968726b merge develop 2021-06-28 18:01:50 +08:00
tickduan afec60f40d init add 2021-06-24 19:58:45 +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
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
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
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
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 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
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
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