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

893 Commits

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