Commit Graph

12235 Commits

Author SHA1 Message Date
huili cf8230acf8
Merge pull request #4954 from taosdata/test/testcase
[TD-2784]<test>test pr from forked repo
2021-01-20 11:08:10 +08:00
huili 32c39b1006
Merge pull request #4943 from taosdata/test/jenkins
[TD-2741][TD-2736]<test>add timeout in jenkins
2021-01-20 11:07:10 +08:00
huili ee5d9b2498
Merge pull request #4947 from taosdata/hotfix/sangshuduo/TD-2769-nodejs-12+-adapt
Hotfix/sangshuduo/td 2769 nodejs 12+ adapt
2021-01-20 11:06:55 +08:00
huili 2b7e6d975f
Merge pull request #4955 from taosdata/feature/TD-2776
Feature/td 2776
2021-01-20 11:06:23 +08:00
Haojun Liao 986aff05d4 [TD-225]merge develop 2021-01-20 11:01:46 +08:00
yihaoDeng e396be7238 fix compile error on windows 2021-01-20 02:56:18 +00:00
yihaoDeng 92db1ea6e8 fix compile error on windows 2021-01-20 02:42:15 +00:00
Haojun Liao 4b3eafad4e Merge branch 'develop' of https://github.com/taosdata/TDengine into develop 2021-01-20 10:41:48 +08:00
Haojun Liao 1ecf965914 [TD-225]refactor 2021-01-20 10:40:16 +08:00
freemine 6485afb69d Merge remote-tracking branch 'upstream/develop' into mac 2021-01-20 10:30:02 +08:00
yihaoDeng 9be6fb9b1e fix compile error on windows 2021-01-20 02:29:42 +00:00
freemine d73cdd656d 1. bugFix: typo in eok.c which results in memory leakage
2. for the sake of SIGALRM used in the base code, add taos_block_sigalrm and so forth
3. TODO: getaddrinfo would block a few unnecessary seconds when host ~ *.local
         better give warning/suggestion message to user, or just bypass getaddrinfo
         and fail the function
2021-01-20 10:05:53 +08:00
yihaoDeng 40da35fa07 fix compile error on windows 2021-01-20 01:58:36 +00:00
Elias Soong 0a8b339640 [TD-2639] <docs>: remove one misplaced doc. 2021-01-20 09:55:38 +08:00
yihaoDeng 9b387049cc fix compile error on windows 2021-01-20 01:45:35 +00:00
Shengliang Guan 404674b563 Merge remote-tracking branch 'origin/develop' into feature/os 2021-01-20 09:44:14 +08:00
Shengliang Guan fffe865871 TD-1207 2021-01-20 09:40:47 +08:00
yihaoDeng 8982256421 fix compile error on windows 2021-01-20 01:39:49 +00:00
dapan1121 e0a5ae459c fix bug 2021-01-19 15:23:43 -10:00
yihaoDeng 33b428a4ca fix compile error in windows 2021-01-20 00:40:09 +00:00
yihaoDeng 0a0e68e208 fix compile error 2021-01-19 23:03:59 +00:00
yihaoDeng d1e4046340 add block dist info 2021-01-19 22:37:22 +00:00
Haojun Liao 55a7ce46c1 [TD-225]refactor. 2021-01-19 22:43:51 +08:00
haojun Liao c20d574160
Merge pull request #4938 from taosdata/feature/TD-2671
[TD-2671]<fix>:support create/drop/alter stable
2021-01-19 22:27:41 +08:00
haojun Liao 20f2762446
Merge pull request #4921 from taosdata/hotfix/TD-2719
[TD-2719]trace subquery states
2021-01-19 22:22:50 +08:00
zyyang 745f421fea change 2021-01-19 19:18:50 +08:00
zyyang cd426de0b3 change 2021-01-19 19:16:22 +08:00
zyyang fe6cebe309 change 2021-01-19 19:13:44 +08:00
zyyang 7834d641ed change 2021-01-19 19:12:15 +08:00
zyyang 8439fca9f5 change 2021-01-19 19:11:27 +08:00
zyyang b14692e5a5 change 2021-01-19 19:04:48 +08:00
zyyang 19d77697d7 change 2021-01-19 19:02:36 +08:00
zyyang f9a9b0dadc change 2021-01-19 18:58:36 +08:00
zyyang 3a08890e24 change 2021-01-19 18:55:52 +08:00
Ping Xiao 9a8d4c9f4c [TD-2720][TD-2247]<test>: add test case 2021-01-19 18:27:41 +08:00
yihaoDeng 1c16f49682 fix bug when calloc failed 2021-01-19 10:27:14 +00:00
Haojun Liao bd25e9e928 [TD-225] refactor codes. 2021-01-19 18:08:58 +08:00
Haojun Liao 84313b70df [TD-2490]<fix>: add check for full table name. 2021-01-19 18:04:25 +08:00
Hongze Cheng 4639796815 fix encode problem in tsdb sync 2021-01-19 09:21:05 +00:00
zyyang 4e2adfe6d2 change 2021-01-19 17:03:38 +08:00
zyyang 03c3cc0f3e change 2021-01-19 16:53:48 +08:00
zyyang 073bb17a10 change 2021-01-19 16:42:05 +08:00
zyyang fb908bc8b0 change 2021-01-19 16:40:02 +08:00
zyyang 9ec1da5f24 change 2021-01-19 16:38:16 +08:00
zyyang 74eb320337 change 2021-01-19 16:32:12 +08:00
zyyang 16530a22eb change 2021-01-19 16:22:13 +08:00
Shengliang Guan 1cfc236b35 Merge from develop 2021-01-19 15:41:57 +08:00
Shengliang Guan d0534df8c0 TD-1207 2021-01-19 15:26:44 +08:00
liuyq-617 0548a495a4 test for 'git fetch origin +refs/pull/#/merge' 2021-01-19 14:43:28 +08:00
Hongze Cheng 514e6ca49f fix a little bug 2021-01-19 06:43:01 +00:00