Commit Graph

12439 Commits

Author SHA1 Message Date
slguan 054a700a29 TD-2837 2021-01-25 18:43:34 +08:00
Hongze Cheng ad67bdf111 fix a coredump 2021-01-25 18:33:48 +08:00
Hongze Cheng 8f63c7d2f1 Merge branch 'feature/TD-1925_new' of https://github.com/taosdata/TDengine into feature/TD-1925_new 2021-01-25 18:16:48 +08:00
Hongze Cheng 2980d7b1e6 fix more bug 2021-01-25 18:15:34 +08:00
dapan1121 0369b0bfa3 add lock for db access 2021-01-25 17:48:04 +08:00
huili becc98420c
Merge pull request #5021 from taosdata/test/testcase
[TD-2840]<test>Add email notification for jenkins
2021-01-25 17:12:06 +08:00
Minglei Jin a2da000145 [TD-2839]<fix>: fix tsOfflineThreshold code comments 2021-01-25 17:10:07 +08:00
Minglei Jin acaefc098b [TD-2832]<fix>: use httpDecodeUrl to parse reserved characters after percent-encoding 2021-01-25 17:00:54 +08:00
dapan1121 5d976a26a5 fix bug 2021-01-25 17:00:22 +08:00
Shengliang Guan a7d53351d7 Merge remote-tracking branch 'origin/develop' into feature/TD-1925_new 2021-01-25 08:31:23 +00:00
Shengliang Guan 50ff0aabbc Merge from develop 2021-01-25 08:30:45 +00:00
Shengliang Guan 6c3eb4fbd9
Merge pull request #5020 from taosdata/feature/mac
Run a full test for the code submitted by freemine
2021-01-25 16:24:01 +08:00
Shengliang Guan be5e6182df Merge from develop 2021-01-25 08:23:32 +00:00
Shengliang Guan 8c3ee8335e
Merge pull request #5019 from taosdata/hotfix/TD-2781
[TD-2781]taosd crashes when query tag is nchar
2021-01-25 16:23:08 +08:00
Hongze Cheng 822f1051d2 implement backward compatibility 2021-01-25 16:05:34 +08:00
Hongze Cheng 481abb03cc fix coredump 2021-01-25 15:38:10 +08:00
Hongze Cheng c8ef616ac5 back compatible 2021-01-25 15:24:41 +08:00
Hongze Cheng eab26d39e2 match with old file format 2021-01-25 15:12:54 +08:00
dapan1121 12f9959702 fix bug 2021-01-25 14:53:05 +08:00
dapan1121 c745ba0b81 fix bug 2021-01-25 14:51:57 +08:00
liuyq-617 c906dd5c1e revert 2021-01-25 14:26:13 +08:00
liuyq-617 85fbc21f7d revert 2021-01-25 14:23:55 +08:00
liuyq-617 7ef5e333b6 fix some error 2021-01-25 14:16:44 +08:00
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