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

12009 Commits

Author SHA1 Message Date
Hongze Cheng 06018d4380 Merge branch 'feature/TD-1925_new' of https://github.com/taosdata/TDengine into feature/TD-1925_new 2021-01-27 10:18:44 +08:00
Hongze Cheng edd9399913 fix tsdb file truncate bug 2021-01-27 10:18:14 +08:00
liuyq-617 d84d06814c <test>fix psutil.procsee error 2021-01-26 16:51:00 +08:00
Hongze Cheng 23b69f62d3 fix test_old_data.sim bug 2021-01-26 10:49:01 +08:00
Hongze Cheng 68d4a494f0 fix data1.sim error 2021-01-25 18:52:49 +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
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
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
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 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