Commit Graph

363 Commits

Author SHA1 Message Date
Hongze Cheng a7c6e73fb6 Merge branch 'develop' into feature/TD-1925 2020-12-28 11:27:33 +08:00
Shengliang Guan 833d65f67b TD-2524 2020-12-23 10:58:59 +08:00
Hongze Cheng dd459c531a Merge branch 'develop' into feature/TD-1925 2020-12-21 17:13:45 +08:00
Haojun Liao cabc32e74d [TD-225]fix clang-tidy warning. 2020-12-16 13:21:20 +08:00
Haojun Liao 40b3b5a457 [TD-2425]<feature>: multi-table creation in one request. 2020-12-15 18:17:38 +08:00
Hongze Cheng 480a71bed6 Merge branch 'develop' into feature/TD-1413 2020-11-30 09:49:22 +08:00
Shengliang Guan dbe3b6f8f6 TD-1895 2020-11-27 23:27:13 +08:00
Hongze Cheng 0ab1a0ff46 Merge branch 'develop' into feature/TD-1413 2020-11-27 01:52:13 +00:00
Shengliang Guan 060299548e change log print 2020-11-26 11:09:46 +08:00
Hongze Cheng a5c3d2c689 refactor 2020-11-20 02:51:42 +00: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 adc8e4e815 refactor 2020-11-19 05:28:57 +00:00
Hongze Cheng 6994cd71e0 make branch compileable 2020-11-18 13:39:45 +08:00
Hongze Cheng 6d736bd099 more code 2020-11-18 10:52:22 +08:00
Hongze Cheng de1a75f64d Merge branch 'develop' into feature/TD-1413 2020-11-18 10:17:18 +08:00
Shengliang Guan 98d254d521 Merge remote-tracking branch 'origin/develop' into feature/wal 2020-11-17 09:22:50 +00:00
Shengliang Guan c230d2ec0e TD-2014 2020-11-17 09:15:41 +00:00
yihaoDeng 590682391b [TD-1785]<fix>: taos_close may fail 2020-11-14 16:05:46 +00:00
Shengliang Guan b5d1aa4801 TD-1985 2020-11-12 05:27:06 +00:00
Shengliang Guan 42693517ae TD-1848 2020-11-10 07:09:25 +00:00
Shengliang Guan 95d3e55042 TD-1848 2020-11-10 06:44:12 +00:00
freemine 9081fd67aa Merge remote-tracking branch 'upstream/develop' into odbc-win 2020-11-08 09:08:56 +08:00
Shuduo Sang 07a39d3813 [TD-1946] <fix>: fix compile issues for VS2019 16.7 on Windows 2020-11-05 14:17:55 +08:00
freemine b8a39b195b Merge remote-tracking branch 'upstream/develop' into odbc-win 2020-11-04 22:14:18 +08:00
Shengliang Guan 03d7e80de1 TD-1912 comile error in windows 2020-11-04 14:45:03 +08:00
Shengliang Guan 30e147df95 TD-1912 2020-11-04 06:37:20 +00:00
Shengliang Guan e453d68a8d TD-1918 2020-11-04 03:19:10 +00:00
Shengliang Guan 8cb17fcf9e
Merge pull request #4095 from taosdata/feature/wal
TD-1912
2020-11-04 09:57:41 +08:00
Shengliang Guan 0397786d54 revert 2020-11-03 23:24:32 +08:00
Shengliang Guan d4ff13d9b1 TD-1912 2020-11-03 23:12:54 +08:00
Shengliang Guan ff25a2c4a5 TD-1912 2020-11-03 22:55:14 +08:00
Shengliang Guan 4482aef905
Merge pull request #4094 from taosdata/feature/wal
TD-1912
2020-11-03 22:17:59 +08:00
Shengliang Guan 977589dee0 compile err in windows 2020-11-03 20:34:35 +08:00
Shengliang Guan 9c7640e570 TD-1912 2020-11-03 20:28:10 +08:00
Shengliang Guan 38c28f1cb6 TD-1912 2020-11-03 20:27:07 +08:00
Shengliang Guan a82ac7de39 TD-1912 2020-11-03 20:06:14 +08:00
Bomin Zhang 3460498500 [TD-1877]<feature>: custom temporary directory 2020-11-03 13:29:53 +08:00
freemine 1eec11e987 first version of runnable win odbc driver 2020-10-27 21:41:16 +08:00
freemine 776e0a39c8 add -Wconversion and refactor accordingly 2020-10-26 11:08:33 +08:00
Shengliang Guan 382adfac68 TD-1413 2020-10-26 10:47:46 +08:00
freemine 7137bf8995 disable C4091 2020-10-25 22:34:20 +08:00
Hongze Cheng 7e6021bc6a more code 2020-10-22 22:41:17 +08:00
Shengliang Guan eb5950b6d6 TD-1767 2020-10-22 10:31:09 +00:00
Shengliang Guan 44963201ab TD-1767 2020-10-22 06:28:44 +00:00
freemine 1df2739281 Merge remote-tracking branch 'upstream/develop' into odbc 2020-10-17 06:25:25 +08:00
Shengliang Guan 938f0773dd
Merge pull request #3851 from taosdata/release/s103
Release/s103
2020-10-14 15:11:10 +08:00
freemine e7fb328524 Merge remote-tracking branch 'upstream/develop' into odbc 2020-10-14 14:05:21 +08:00
Hui Li 90c2b1f527 include file for static packaging 2020-10-14 11:11:41 +08:00
Haojun Liao 49ae6c39e5 [td-225] 2020-10-13 13:26:32 +08:00
Haojun Liao d4a18dd68c [td-225] 2020-10-13 13:14:50 +08:00
Haojun Liao 3caf1ffc04 [td-225] 2020-10-13 11:53:16 +08:00
Haojun Liao 66ab0cd04c [td-225] 2020-10-13 11:47:45 +08:00
Haojun Liao 6a88d306c8 [td-1641] 2020-10-10 22:38:56 +08:00
Haojun Liao f3250e62bd [td-1660] 2020-10-10 09:45:18 +08:00
freemine 52f023c028 init odbc 2020-10-06 22:53:15 +08:00
Shengliang Guan 60688a0365
Merge pull request #3743 from taosdata/develop
Merge from develop
2020-10-02 08:50:28 +08:00
jinzhao 89779e71c9 fix cross compile failed in arm32 2020-09-29 15:48:40 +08:00
Haojun Liao ec0290c94d [td-225] merge develop 2020-09-28 23:06:06 +08:00
Haojun Liao db66a5da57 [td-225] 2020-09-28 22:57:06 +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 ca028a3d17 TD-1530 2020-09-28 04:20:40 +00:00
Shengliang Guan 6a1825905b minor changes 2020-09-28 03:22:31 +00:00
Shengliang Guan 077c8ff412 TD-1530 2020-09-28 02:55:59 +00:00
Shengliang Guan 2811c96b30 TD-1530 2020-09-28 10:29:49 +08:00
Shengliang Guan 251fdf2c97 TD-1617 defect found by coverity scan 2020-09-27 11:12:38 +00:00
Shengliang Guan 2cd68ffe69 TD-1574 compile in windows 2020-09-25 15:40:17 +08:00
Haojun Liao 535816bc5a [td-1596] 2020-09-24 17:45:57 +08:00
Shengliang Guan d627ab2a88 TD-1574 2020-09-23 15:01:18 +00:00
Shengliang Guan 2d6f6afc17 compile in windows 2020-09-17 12:14:34 +08:00
Bomin Zhang 7cdb6c3f24 td-1245: disable natual duration in 'insert'&'where' 2020-09-17 09:44:02 +08:00
Bomin Zhang 6fa86bfb8f td-1245: fix crash and refactor 2020-09-17 09:44:02 +08:00
Bomin Zhang 85aca0c276 td-1245: replace taosAddNatualInterval with taosTimeAdd 2020-09-17 09:44:02 +08:00
Bomin Zhang 76d407395f td-1245: refactor interval/sliding/offset to one struct 2020-09-17 09:44:02 +08:00
Shengliang Guan 227e8f37ab TD-1244 2020-09-08 15:56:47 +08:00
Shengliang Guan bafad31882 TD-1263 compile in windows 2020-09-08 15:18:16 +08:00
Shengliang Guan f65e360976 TD-1263 2020-09-08 06:27:11 +00:00
Shengliang Guan 37922f299f TD-1263 2020-09-08 04:27:55 +00:00
Shengliang Guan e69fbd54a2 [TD-1263] add config items, logKeepDays and logbakDir 2020-09-07 14:35:56 +00:00
Shengliang Guan fb26143c7c
Merge pull request #3407 from taosdata/master
Master
2020-09-07 14:37:38 +08:00
Shuduo Sang 1dad79456d 'minor' 2020-09-07 12:56:33 +08:00
Shengliang Guan 9487d607ae compile not pass even in some vs2013 environments 2020-09-07 12:35:34 +08:00
Hui Li eb9a1f9655 [issue:3375] 2020-09-05 12:58:36 +08:00
Shengliang Guan 7b364249e9
Merge pull request #3306 from taosdata/feature/td-1099
natural interval
2020-09-01 09:46:31 +08:00
Hui Li 934f2c473d [TD-1228] 2020-08-29 16:16:02 +08:00
Hui Li 790c28f205 [TD-1228] 2020-08-29 16:07:53 +08:00
Bomin Zhang fb19257a99 td-1099: parse natual month/year 2020-08-29 15:47:39 +08:00
Hui Li 57ec385903 [TD-1228] 2020-08-29 15:45:02 +08:00
Shengliang Guan bd908f4ab0
Merge branch 'develop' into mergetodevelop 2020-08-27 17:22:22 +08:00
Bomin Zhang 829caf39d3 td-1242: wait again if sem_wait returns EINTR 2020-08-27 10:12:54 +08:00
Shengliang Guan 92bff4ed55 TD-1090 rename some files 2020-08-25 16:59:16 +08:00
Shengliang Guan 374c05602c
Merge pull request #3208 from taosdata/fmaster/lihui
Fmaster/lihui
2020-08-24 19:49:08 +08:00
Hui Li c6c3d96cb5 [TD-880] 2020-08-24 18:18:48 +08:00
Hui Li ee5038ea85 [TD-880] 2020-08-24 18:12:43 +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 97d07a25bb TD-1090 minor changes 2020-08-20 16:38:40 +08:00
Shengliang Guan e53ebe94df TD-1090 compile client in windows 32 platform 2020-08-20 16:27:44 +08:00
Shengliang Guan a175845887 minor changes 2020-08-19 05:55:00 +00:00
Shengliang Guan 6ff0bb47ea TD-1090 2020-08-19 09:58:05 +08:00
Shengliang Guan 3595d06a64 TD-1165 fix defects found by coverity scan 2020-08-17 09:47:00 +00:00
Shengliang Guan 7f885cb3b3 TD-1057 2020-08-14 09:39:56 +00:00
Shengliang Guan faabd6e5cb TD-1057 compile error in vs2019 2020-08-14 16:59:41 +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 70be4639a3 TD-1047 change include files 2020-08-12 22:39:10 +08:00
Shengliang Guan 94d0aa193d TD-1057 set crash in windows 2020-08-12 14:44:09 +08:00
Shengliang Guan 1e24b99534 TD-1057 system function in windows 2020-08-11 17:58:41 +08:00
Shengliang Guan 09072fba18 TD-1057 localtime func may crash while input < 0 in windows 2020-08-11 16:45:01 +08:00
Shengliang Guan 2dfcac405a TD-1057 change pthread_t to int64 2020-08-10 23:51:53 +08:00
Shengliang Guan 4bd41a0fbf TD-1057 2020-08-10 18:17:14 +08:00
Shengliang Guan ceab359b91 TD-1057 2020-08-09 20:59:23 +08:00
Shengliang Guan ab6151cd90 TD-1057 2020-08-08 17:52:48 +08:00
Shengliang Guan ef8135a609 TD-1057 2020-08-08 16:38:44 +08:00
Shengliang Guan 7e3cd84df0 TD-1057 2020-08-08 13:04:29 +08:00
Shengliang Guan a18e287ca5 TD-1057 2020-08-08 11:06:32 +08:00
Shengliang Guan 87a73142a1 TD-1057 2020-08-07 19:28:05 +08:00
Shengliang Guan ef2f966da5 TD-1057 2020-08-07 18:59:52 +08:00
Shengliang Guan 8e53280b3c TD-1057 2020-08-07 16:58:55 +08:00
Shengliang Guan 1dc751200a TD-1057 2020-08-06 18:07:24 +08:00
Shengliang Guan 4a25ad2b4e TD-1057 2020-08-05 19:04:30 +08:00
Shengliang Guan f790003eeb TD-1057 2020-08-05 18:36:38 +08:00
Shengliang Guan f84ac22b3a TD-1057 2020-08-05 16:35:12 +08:00
Shengliang Guan 14c90236b7 TD-1057 2020-08-05 16:24:10 +08:00
Shengliang Guan acdb8dcac2 TD-1057 2020-08-05 11:29:48 +08:00
Shengliang Guan a9899065ba TD-1038 compile for windows client 2020-08-04 16:05:41 +08:00
Shengliang Guan 73e0e84bbf TD-1037 compilation of common module 2020-08-04 14:48:38 +08:00
Shengliang Guan 3ff60c3ec1 TD-1037 2020-08-04 11:19:16 +08:00
slguan 362fb3d36a TD-1037 os module compile 2020-08-03 18:26:37 +08:00
Bomin Zhang ca9c0ad282 TD-1033: enable telemetry reporting by default
disable telemetry reporting in test.
fix other telemetry related bugs.
2020-08-03 11:31:14 +08:00
Shengliang Guan 8a68dd6e6b [TD-1033] change clusterId to string 2020-08-02 11:43:07 +00:00
Shengliang Guan dc64d4edc5 [TD-1037] 2020-07-31 23:33:02 +08:00
Shengliang Guan 9d6896cc16 [TD-992] 2020-07-31 08:17:20 +00:00
slguan d59ceb7ba2 [TD-992] 2020-07-31 16:12:55 +08:00
slguan 8089a23c27 [TD-992] 2020-07-31 16:09:38 +08:00
slguan de38e2cf4f [TD-992] 2020-07-31 15:29:11 +08:00
Shengliang Guan caf933403f [TD-992] 2020-07-31 07:23:05 +00:00
slguan 86fd70c2fd [TD-992] 2020-07-31 14:59:52 +08:00
Shengliang Guan 22c9d652a8 [TD-992] 2020-07-31 06:51:02 +00:00
Shengliang Guan b628b891e4 [TD-992] 2020-07-31 14:44:31 +08:00
Shengliang Guan 794e20c99f [TD-992] 2020-07-31 06:18:23 +00:00
slguan ee82eb602c TD-992 cmake file for w64 2020-07-31 10:17:15 +08:00
slguan d012c3eb8e [TD-992] cmake file for darwin 2020-07-30 18:44:29 +08:00
Shengliang Guan 45ec0df68b failed to compile whle random test enabled 2020-07-29 11:34:00 +00:00
Shengliang Guan d39a3320ee [TD-992] adjust cmake files 2020-07-28 08:58:00 +00:00
Shengliang Guan 55d1b9027f [TD-992] 2020-07-28 06:42:32 +00:00
Shengliang Guan 999dc0af1b [TD-992] 2020-07-28 06:40:55 +00:00
Shengliang Guan 64d818516b [TD-992] refactor os module 2020-07-28 03:21:15 +00:00
Shengliang Guan 276fb37099 [TD-992] refactor codes 2020-07-28 02:59:54 +00:00