Commit Graph

13116 Commits

Author SHA1 Message Date
liuyq-617 d5a4e0c368 [TD-2840]<test>Add email notification for jenkins 2021-01-25 13:59:58 +08:00
Shengliang Guan 8e2eb0de92 Merge remote-tracking branch 'origin/develop' into feature/mac 2021-01-25 13:50:40 +08:00
Shengliang Guan 3afb13a419
Merge pull request #5008 from taosdata/feature/win
Feature/win
2021-01-25 13:44:00 +08:00
Shengliang Guan 7625e803d1 TD-2837 2021-01-25 13:23:55 +08:00
Shengliang Guan 80dfa0a47e TD-2837 2021-01-25 12:54:27 +08:00
slguan 9efd58c62a TD-2837 2021-01-25 11:53:55 +08:00
slguan 2735136606 Merge remote-tracking branch 'freemine/mac' into feature/mac 2021-01-25 11:39:06 +08:00
Shengliang Guan 39bd90915a TD-1207 compile error in windows 2021-01-25 11:30:41 +08:00
Haojun Liao c8b92c46c7 [TD-225]refactor 2021-01-24 22:52:35 +08:00
Hongze Cheng 2232203569 fix sync problem 2021-01-24 18:52:08 +08:00
Hongze Cheng 63a6fcd74d Merge branch 'develop' into feature/TD-1925_new 2021-01-24 17:59:57 +08:00
Shengliang Guan 8f488a0f99 compile error in 2019 2021-01-24 17:57:55 +08:00
Shengliang Guan d95effe1fb TD-1207 2021-01-24 17:31:56 +08:00
Shengliang Guan b8e192b336 Merge remote-tracking branch 'origin/develop' into feature/win 2021-01-24 17:31:41 +08:00
Hongze Cheng 2b3c8517ec fix copy fds return value 2021-01-24 17:28:37 +08:00
Shengliang Guan 2130b01b29
Merge pull request #5010 from taosdata/docs/sangshuduo/TD-2829-refine-windows-compiling-section-of-README
[TD-2829] <docs>: refine Windows compiling section of README.md
2021-01-24 17:12:16 +08:00
Shengliang Guan 50ce305ea0
Merge pull request #5009 from taosdata/hotfix/sangshuduo/TD-2696-fix-RFC3339-timestamp-bug
[TD-2696] <fix>: fix RFC3339 timestamp bug.
2021-01-24 17:10:26 +08:00
Shengliang Guan 1bbaf84605 Merge remote-tracking branch 'origin/develop' into feature/win 2021-01-24 11:55:27 +08:00
Shengliang Guan d6a79a4316 compile error in v2019 2021-01-24 11:53:33 +08:00
haojun Liao 2445b52013
Merge pull request #5017 from taosdata/feature/query
[TD-225]fix compiler error.
2021-01-24 11:52:34 +08:00
Shengliang Guan c4c40ca66e Merge remote-tracking branch 'origin/feature/query' into feature/win 2021-01-24 11:06:14 +08:00
Shengliang Guan e7614def7b Merge remote-tracking branch 'origin/develop' into feature/win 2021-01-24 10:43:16 +08:00
Shengliang Guan a368b7b40a TD-1207 change int32_t to socket 2021-01-24 10:24:44 +08:00
freemine 15b7973e48 typo 2021-01-24 09:44:47 +08:00
freemine 6edc669fd3 Merge remote-tracking branch 'vbox/mac' into mac 2021-01-24 09:32:51 +08:00
freemine ce50e131bc 1. kqueue rather than SIGALRM for the timer
2. semaphore rather than dispatch_semaphore for tsem_xxx
3. fail-fast comments
4. niche
2021-01-24 09:29:13 +08:00
Haojun Liao 59be544025 Merge branch 'develop' into feature/query 2021-01-23 23:33:50 +08:00
haojun Liao 0620cf5e00
Merge pull request #5013 from taosdata/hotfix/TD-2804
[TD-2804]taosd crash when try to free subquery
2021-01-23 23:31:06 +08:00
haojun Liao c62866099d
Merge pull request #4981 from taosdata/feature/distinct_tag
Feature/distinct tag
2021-01-23 23:30:08 +08:00
Haojun Liao 9c58bfbd79 [TD-225]update the sim. 2021-01-23 23:16:01 +08:00
Haojun Liao 67e2a153b0 [TD-225]fix compiler error. 2021-01-23 23:02:21 +08:00
haojun Liao 424224abcd
Merge pull request #5011 from taosdata/feature/TD-1979
add block dist info
2021-01-23 22:51:04 +08:00
haojun Liao efeeb5757e
Merge branch 'develop' into feature/TD-1979 2021-01-23 22:50:53 +08:00
haojun Liao c4c736ab04
Merge pull request #5014 from taosdata/hotfix/TD-2787
[TD-2787]taosd percentile query crashes
2021-01-23 22:44:59 +08:00
haojun Liao b135fc9ef0
Merge pull request #5012 from taosdata/feature/query
Feature/query
2021-01-23 22:44:27 +08:00
Haojun Liao dd47b64c41 [TD-225]fix error in sim script. 2021-01-23 15:49:29 +08:00
Haojun Liao 2b126c4106 [TD-225]fix compiler error. 2021-01-23 15:39:42 +08:00
Haojun Liao 146d7153c0 [TD-225]fix error. 2021-01-23 15:35:05 +08:00
Haojun Liao 7f56eb9de3 [TD-225]fix compiler error. 2021-01-23 15:29:30 +08:00
Haojun Liao 7081fdf8fd [TD-225]update the sim. 2021-01-23 15:14:53 +08:00
Haojun Liao 2572641615 Merge branch 'develop' into feature/query 2021-01-23 15:13:55 +08:00
Haojun Liao 7da756f2c0 [TD-225]fix compiler error. 2021-01-23 15:10:30 +08:00
Haojun Liao f1657736e1 [TD-225]refactor. 2021-01-23 15:07:43 +08:00
Haojun Liao af428c4d24 [TD-225]refactor codes. 2021-01-23 14:57:47 +08:00
Haojun Liao f56eb0d446 [TD-225]fix memory leak. #4914 2021-01-23 14:50:01 +08:00
Haojun Liao 7ee01d6d5e [TD-225]refactor. 2021-01-23 14:49:06 +08:00
Shuduo Sang b15d8fefaa [TD-2829] <docs>: refine Windows compiling section of README.md 2021-01-23 12:55:47 +08:00
Shuduo Sang 79e4925dc7 [TD-2696] <fix>: fix RFC3339 timestamp bug. 2021-01-23 12:00:02 +08:00
freemine c96827dcb4 Merge remote-tracking branch 'upstream/develop' into mac 2021-01-23 09:38:28 +08:00
freemine 0765b2363c Merge remote-tracking branch 'upstream/develop' into mac 2021-01-23 08:47:00 +08:00