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
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