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

5317 Commits

Author SHA1 Message Date
Shengliang Guan 69180d74cf Merge remote-tracking branch 'origin/hotfix_dky' into master 2020-09-10 10:30:29 +08:00
Shengliang Guan d4a177532d
Merge pull request #3457 from taosdata/master 
Master
 2020-09-10 10:26:20 +08:00
Hongze Cheng aee27e3649 Merge branch 'master' into hotfix/TD-1401 2020-09-09 23:34:37 +08:00
Haojun Liao 9768c30be1 [td-1372] 2020-09-09 22:15:12 +08:00
Hongze Cheng f06fc01904 TD-1401 2020-09-09 22:07:03 +08:00
Shengliang Guan 880aaf57db
Merge pull request #3454 from taosdata/feature/crash 
Feature/crash
 2020-09-09 20:59:46 +08:00
Shengliang Guan 3ab600eadc
Merge pull request #3453 from taosdata/hotfix/TD-1039 
[TD-1039]<fix>：query 'select database()' return  result like mysql
 2020-09-09 20:59:25 +08:00
Shengliang Guan 888e0f2a91 minor changes 2020-09-09 11:15:18 +00:00
Shengliang Guan add82236f6 TD-1397 2020-09-09 11:10:58 +00:00
zyyang aa2ab56de0 update jdbc test cases 2020-09-09 18:52:33 +08:00
yihaoDeng f8bab293cb TD-1039 2020-09-09 10:36:09 +00:00
Haojun Liao 5b6ca20f0b [td-225] refactor codes. 2020-09-09 18:15:59 +08:00
Shengliang Guan 9166f264d5
Merge pull request #3449 from taosdata/master 
Master
 2020-09-09 13:53:53 +08:00
Haojun Liao 25b2cec2f5 [td-1369] 2020-09-09 13:28:08 +08:00
Haojun Liao 2a395670bd [td-1369] 2020-09-09 13:24:07 +08:00
Haojun Liao fb25b058ae [td-1394] add the returning value check after invoking the load data block from file function. 2020-09-09 13:22:45 +08:00
Haojun Liao ed7e81f154 [td-1393] opt last_row query with tags filter conditions. 2020-09-09 13:17:24 +08:00
Shengliang Guan e19dc2b7cb
Merge pull request #3446 from taosdata/feature/TD-1370 
[TD-1370]<enhance>: support function count(1)
 2020-09-09 12:48:30 +08:00
Shengliang Guan eae082a565
Merge pull request #3443 from taosdata/bugfix/td-1309 
[TD-1309]<fix>: comparation of incompatible types should raise an error(#3349)
 2020-09-09 12:48:04 +08:00
Hongze Cheng 0b4606ec14 fix TD-1387 2020-09-09 11:12:01 +08:00
Bomin Zhang 99be2d9b06 fix td-1309 2020-09-09 09:46:17 +08:00
Shengliang Guan 528521075a TD-1377 TD-1258 TD-1286 update logs 2020-09-08 14:27:40 +00:00
Shengliang Guan ad08160eb3 minor changes while compile in windows 2020-09-08 19:04:49 +08:00
Shengliang Guan 7abc1f1a4a Merge remote-tracking branch 'origin/develop' into feature/crash 2020-09-08 17:52:09 +08:00
Shengliang Guan 1c380d39dc
Merge pull request #3437 from taosdata/xiaoping/add_test_case 
[TD-1360]<test>: add test case - read binary data using Java
 2020-09-08 17:51:54 +08:00
Shengliang Guan 42a44bcbd3 TD-1363 Ensure the sync of mnode not interrupted 2020-09-08 09:23:06 +00:00
Shengliang Guan f3217b9706 minor changes 2020-09-08 09:13:17 +00:00
Ping Xiao 043f2cb2f4 [TD-1360]<test>: add test case - read binary data using Java 2020-09-08 17:06:14 +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 159f59a15e TD-1263 2020-09-08 06:35:07 +00:00
Shengliang Guan dab6292b98 Merge remote-tracking branch 'origin/develop' into feature/crash 2020-09-08 06:28:40 +00: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 5bafd2a6f7
Merge branch 'develop' into todevelop 2020-09-08 10:57:47 +08:00
Shengliang Guan 2368b35cec
Merge pull request #3422 from taosdata/hotfix/TD-1362 
fix TD-1362
 2020-09-08 10:53:44 +08:00
Shengliang Guan ca493df61d
Merge pull request #3421 from taosdata/hotfix/retention_problem 
fix TD-1362
 2020-09-08 10:51:33 +08:00
Hongze Cheng ab039d7d06 fix TD-1362 2020-09-08 10:19:36 +08:00
Hongze Cheng f7d2e7d905 fix TD-1362 2020-09-08 10:00:08 +08:00
Bomin Zhang b78011e858 fix td-1299 (github #3309) 2020-09-08 09:49:27 +08:00
yihaoDeng 39a2e01d40 TD-1370 2020-09-08 01:17:30 +00:00
Haojun Liao 1f2d5f9ee8 [td-225] fix bug while the content in binary column equals to the maximum allowed length 2020-09-08 00:08:18 +08:00
Haojun Liao 0755ec1f12 [td-225] fix bug while the content in binary column equals to the maximum allowed length 2020-09-07 23:58:53 +08:00
Shengliang Guan e69fbd54a2 [TD-1263] add config items, logKeepDays and logbakDir 2020-09-07 14:35:56 +00:00
Shengliang Guan e5adfe5144
Merge pull request #3417 from taosdata/feature/mqtt 
Feature/mqtt
 2020-09-07 21:55:29 +08:00
Shengliang Guan 93f007712a TD-1336 2020-09-07 11:50:36 +00:00
Haojun Liao 7550b6c595 [td-225] merge develop 2020-09-07 18:49:15 +08:00
Shengliang Guan 59e9f7d57b TD-1293 update log 2020-09-07 10:47:36 +00:00
root c413e0d775 Merge remote-tracking branch 'origin/develop' into feature/mqtt 2020-09-07 15:26:25 +08:00
Haojun Liao 93967816ea [td-225] merge develop 2020-09-07 15:22:46 +08:00
root 091271b02d minor changes 2020-09-07 15:12:02 +08:00
Shengliang Guan 5e5750bde3
Merge pull request #3406 from taosdata/feature/mqtt 
Feature/mqtt
 2020-09-07 15:11:08 +08:00
Haojun Liao 75ddb1ff0c [td-225] fix bugs 2020-09-07 14:57:04 +08: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
root a1b1b8ab11 scripts 2020-09-07 11:39:58 +08:00
root 07b38c1cac Merge remote-tracking branch 'origin/develop' into feature/mqtt 2020-09-07 11:24:24 +08:00
Shengliang Guan 95514381e8
Merge pull request #3394 from taosdata/feature/query 
Feature/query
 2020-09-06 12:13:27 +08:00
Shengliang Guan 25c0b8cbe9 [TD-1293 ]<fix>: monitor uses too many resources and may cause auth failure 2020-09-05 09:50:15 +00:00
Haojun Liao 401e729961 [td-1333] 2020-09-05 14:53:59 +08:00
Haojun Liao 3a54e379ad [td-1333] 2020-09-05 14:52:15 +08:00
Haojun Liao b98ed27fe4 [td-1315] 2020-09-05 13:27:19 +08:00
Haojun Liao 0f9543994a [td-1315] 2020-09-05 13:24:35 +08:00
Hui Li eb9a1f9655 [issue:3375] 2020-09-05 12:58:36 +08:00
root 189c30345f minor changes 2020-09-05 10:34:19 +08:00
Shengliang Guan 6aa2db02bb Merge from develop 2020-09-05 02:22:15 +00:00
Shengliang Guan a4419e1f98
Merge pull request #3383 from taosdata/feature/2.0tsdb 
Feature/2.0tsdb
 2020-09-05 09:35:57 +08:00
Haojun Liao cf03175916 [td-225] 2020-09-04 22:55:07 +08:00
Haojun Liao 8795d19009 [td-225] 2020-09-04 22:47:37 +08:00
Haojun Liao 10af6ae350 [td-225] 2020-09-04 22:31:12 +08:00
Haojun Liao bcee3a4ae9 [td-1334] refactor codes. 2020-09-04 22:26:49 +08:00
Bomin Zhang 379d574d7d fix TD-1334: select count(*) returns wrong result 
github #3334
 2020-09-04 18:29:51 +08:00
Shengliang Guan d3fb06fdf6
Merge pull request #3377 from taosdata/patch/td-804 
td-804: fix infinite SQL parse retry
 2020-09-04 17:59:06 +08:00
Hongze Cheng 9bf2f5c29a fix compile problem 2020-09-04 17:48:55 +08:00
Shengliang Guan 2932bc24bb TD-1224 update the uid generate algorithm 2020-09-04 09:36:54 +00:00
Shengliang Guan 083adfb4ae TD-1303 2020-09-04 08:46:08 +00:00
Shengliang Guan 4ae4d16043 TD-1323 allow first and second not to configure port 2020-09-04 08:36:29 +00:00
Hongze Cheng 3bdde80638 fix compile error 2020-09-04 16:35:32 +08:00
Hongze Cheng 10621dafd8 TD-1027 2020-09-04 16:06:28 +08:00
Hongze Cheng 7f56ba6056 TD-1027 2020-09-04 15:09:04 +08:00
Shuduo Sang f556ccac1d Merge branch 'develop' into feature/sangshuduo/snap 2020-09-04 14:36:09 +08:00
Shuduo Sang f21200d9f1 remove personalfiles interface. 2020-09-04 14:35:14 +08:00
Haojun Liao e9c0e7d2f1 [td-225] 2020-09-04 14:04:30 +08:00
Hongze Cheng b7584337ab add more functionality file 2020-09-04 13:57:04 +08:00
Haojun Liao bf8c9f7df3 [td-225] 2020-09-04 13:20:56 +08:00
Haojun Liao 510be65028 [td-1315] 2020-09-04 11:50:57 +08:00
Haojun Liao 39e55b2021 [td-1315] 2020-09-04 10:33:57 +08:00
Hongze Cheng 4f00e37d95 Merge branch 'develop' into feature/2.0tsdb 2020-09-04 09:26:42 +08:00
root a4da89b3ae Merge remote-tracking branch 'origin/develop' into feature/mqtt 2020-09-04 00:01:58 +08:00
Shengliang Guan 42f83c3cb0 TD-1310 minor changes 2020-09-03 15:35:54 +00:00
Shengliang Guan 932761a2e1 minor changes 2020-09-03 14:35:58 +00:00
Shengliang Guan 011ca825f9 TD-1310 Refactor the mqtt module codes 2020-09-03 14:29:40 +00:00
Bomin Zhang 139dabf151 td-804: fix infinite SQL parse retry 2020-09-03 18:47:47 +08:00
haojun Liao cb0def34ab
Merge pull request #3368 from taosdata/feature/query 
[td-1308]
 2020-09-03 18:38:58 +08:00
Haojun Liao 29a8c27dcb [td-1308] 2020-09-03 18:37:47 +08:00
Bomin Zhang 591f36f325 td-804: fix infinite SQL parse retry 2020-09-03 18:32:06 +08:00
Hongze Cheng 91d7c7748f refactor part of code 2020-09-03 17:21:23 +08:00
Haojun Liao 4db1086ed9 Merge remote-tracking branch 'origin/feature/query' into feature/query 2020-09-03 17:06:39 +08:00
Haojun Liao 19b0a7ccb7 [td-1322] 2020-09-03 17:05:07 +08:00
root 69da21ce33 Merge remote-tracking branch 'origin/develop' into feature/query 2020-09-03 16:25:02 +08:00
Haojun Liao ec56739527 [td-1317] 2020-09-03 16:17:48 +08:00
Shengliang Guan 60416be4ea TD-1310 2020-09-03 07:59:51 +00:00
Shengliang Guan b87ad41985 Merge remote-tracking branch 'origin/develop' into feature/mqtt 2020-09-03 05:57:32 +00:00
Haojun Liao b77b767a02 [td-1317] 2020-09-03 13:53:09 +08:00
Shengliang Guan 6d7509c7f5 Merge branch 'develop' into patch/td-804 2020-09-03 13:48:36 +08:00
Shengliang Guan ad04bca69f
Merge pull request #3360 from taosdata/feature/query 
Feature/query
 2020-09-03 11:04:35 +08:00
Haojun Liao 0ef20b379b [td-225] 2020-09-03 10:31:06 +08:00
Haojun Liao 8137a287b9 [td-225] fix last query bug and add some function definitions. 2020-09-03 10:28:02 +08:00
Bomin Zhang ab0d29f9a1 td-804: pass all smoke test 2020-09-03 09:43:35 +08:00
Shengliang Guan d75ce1715e TD-1310 2020-09-02 10:52:32 +00:00
Shengliang Guan d9865e1b91 compile error in windows 2020-09-02 17:37:05 +08:00
Shengliang Guan ff7794c0d6
Merge pull request #3353 from taosdata/feature/query 
Feature/query
 2020-09-02 17:28:19 +08:00
Shengliang Guan 20c31144fb
Merge pull request #3350 from taosdata/feature/TD-934 
TD-934
 2020-09-02 17:09:48 +08:00
Haojun Liao bc63c4e0bc [td-225] fix compiler error. 2020-09-02 17:07:44 +08:00
Haojun Liao 35c9252f19 [td-225] merge develop 2020-09-02 16:43:07 +08:00
root d5f380306e TD-1248 TD-1044 TD-1247 fix crash in tcache.c 2020-09-02 15:40:29 +08:00
Shengliang Guan d8b0d405e2
Merge pull request #3344 from taosdata/feature/os 
Feature/os
 2020-09-02 12:56:33 +08:00
Shengliang Guan da45887722 TD-1204 2020-09-02 12:03:19 +08:00
Haojun Liao b3c76157a1 [td-225] 2020-09-02 10:09:58 +08:00
Haojun Liao 88ba66dd8b [td-1290] 2020-09-02 10:08:35 +08:00
Shengliang Guan 1670cb5c16
Merge pull request #3335 from taosdata/master 
Master
 2020-09-01 18:11:13 +08:00
Bomin Zhang 89d87300d3 fix td-804 2020-09-01 18:04:05 +08:00
Shengliang Guan 44acc06316 TD-1204 2020-09-01 17:48:51 +08:00
Haojun Liao fb1178c452 [td-1302] 2020-09-01 17:35:37 +08:00
Shengliang Guan 992b6febe1 TD-1204 2020-09-01 16:53:47 +08:00
Hui Li 030d1fa459 [modify taosc name for oem power] 2020-09-01 15:40:20 +08:00
Shengliang Guan eaffad415c
Merge pull request #3329 from taosdata/master 
Master
 2020-09-01 14:31:38 +08:00
Hui Li 9adf8d2676 [del get version info from version.c] 2020-09-01 14:03:39 +08:00
Shengliang Guan 9ff439408b compile in windows 2020-09-01 13:25:53 +08:00
Shengliang Guan 17102c8eac
Merge pull request #3321 from taosdata/feature/2.0tsdb 
Feature/2.0tsdb
 2020-09-01 13:18:03 +08:00
Shengliang Guan eb9f101bc0
Merge pull request #3318 from taosdata/master 
Merge from Master into Develop
 2020-09-01 12:34:38 +08:00
Haojun Liao 2ae765caaf [td-1278] 2020-09-01 12:00:00 +08:00
haojun Liao f1f3d9aa60
Merge pull request #3311 from taosdata/feature/TD-1230 
Feature/td 1230
 2020-09-01 11:56:42 +08:00
Haojun Liao 9b75283859 [td-1250] 2020-09-01 11:40:34 +08:00
Shengliang Guan 1ca3e34d34 compile error in windows 2020-09-01 11:28:03 +08:00
Hongze Cheng 7074c95a9a add more check on data compress and decompress 2020-09-01 10:44:39 +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 bc5e56517a [TD-1256] 2020-08-31 17:30:59 +08:00
Hui Li bd66367877 [del taosnetwork dir] 2020-08-31 17:26:51 +08:00
Hui Li 3e15d4616d [TD-1256] 2020-08-31 17:26:03 +08:00
Hui Li 599760c6e3 [TD-1256] 2020-08-31 17:24:28 +08:00
Bomin Zhang e967332096 td-1099: natual interval in stream and bug fix 2020-08-31 17:12:50 +08:00
Haojun Liao 580448e381 [td-621] 2020-08-31 16:41:16 +08:00
Haojun Liao f3c92ad39b [td-1206] 2020-08-31 16:40:41 +08:00
Shengliang Guan 4e2fe07551
Merge branch 'develop' into hotfix/mergetodev1 2020-08-31 13:58:49 +08:00
yihaoDeng 09eb6ed916 TD-934 2020-08-31 05:41:22 +00:00
yihaoDeng 17b99416a2 TD-934 2020-08-31 05:28:43 +00:00
Shengliang Guan 29d2e3eead TD-1247 crash while release hash obj 2020-08-31 13:25:12 +08:00
Hui Li 018feb4101 [TD-181] 2020-08-31 11:39:11 +08:00
yihaoDeng a67361ebb9 add test cast 2020-08-30 01:36:16 +00:00
Bomin Zhang 1afed4c067 td-1099: fix bug & compile error / add test cases 2020-08-29 17:18:14 +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 b3840db93e td-1099: natual month/year processing 2020-08-29 15:47:39 +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 c476eb0933
Merge pull request #3291 from taosdata/TD-1280-fix 
update jdbc test cases
 2020-08-29 15:10:15 +08:00
Shengliang Guan e363c01d40 Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-29 06:48:47 +00:00
zyyang aa59367c80 update jdbc test cases 2020-08-29 14:32:33 +08:00
zyyang 8a455cfd82 update jdbc test cases 2020-08-29 13:52:57 +08:00
zyyang 3f09fcb0b0 change the jdbc test cases 2020-08-29 13:34:52 +08:00
Shengliang Guan 544562af01 TD-1248 TD-1044 2020-08-29 03:43:53 +00:00
yihaoDeng 0bb8ca7d1b TD-1230 2020-08-28 18:35:12 +00:00
Shengliang Guan feebfa626e TD-1173 Invalid account permission settings 2020-08-28 08:31:51 +00:00
Shengliang Guan d09567c82b TD-1257 2020-08-28 06:42:05 +00:00
Shengliang Guan 3e9834c907 Merge remote-tracking branch 'origin/develop' into hotfix/sync 2020-08-28 05:51:32 +00:00
Shengliang Guan 28cef33a72 minor changes 2020-08-28 13:08:34 +08:00
Shengliang Guan e16572e459 Merge remote-tracking branch 'origin/fmaster/lihui' into feature/os 2020-08-28 13:04:25 +08:00
Hui Li 89744f4ba8 [release version modify] 2020-08-28 13:00:53 +08:00
Shengliang Guan ae8fbb6b21 TD-1090 compile error in windows 2020-08-28 11:57:40 +08:00
Shengliang Guan 9e97c25d3c
Merge pull request #3132 from taosdata/feature/query 
Feature/query
 2020-08-28 10:26:46 +08:00
Shengliang Guan 90367ca788 TD-1257 mnode module startup check condition is wrong 2020-08-27 15:21:37 +00:00
Shengliang Guan 5b42f5d586
Merge pull request #3271 from taosdata/master 
Merge from master into develop
 2020-08-27 22:47:54 +08:00
Haojun Liao 3c45dcdee9 [td-255] replace wcsncpy with memcpy 2020-08-27 22:26:37 +08:00
Shengliang Guan d9faca1c01
Merge pull request #3255 from taosdata/hotfix/sync 
Hotfix/sync
 2020-08-27 21:08:27 +08:00
Shengliang Guan 037f561c95
Merge pull request #3267 from taosdata/hotfix/TD-857 
TD-857
 2020-08-27 21:06:56 +08:00
Shengliang Guan 37c2d3eb7d minor changes 2020-08-27 13:06:19 +00:00
yihaoDeng df013fc336 TD-857 2020-08-27 11:13:20 +00:00
Haojun Liao 76ad0bc70e [td-255] add check for memory allocation failure. 2020-08-27 18:32:34 +08:00
Shengliang Guan bd908f4ab0
Merge branch 'develop' into mergetodevelop 2020-08-27 17:22:22 +08:00
Shengliang Guan 9028c1de9a
Merge pull request #3263 from taosdata/hotfix/connrelease 
Update mnodeProfile.c
 2020-08-27 17:20:29 +08:00
haojun Liao abc80f352e
Update mnodeProfile.c 
Update the mnode connection activity time
 2020-08-27 16:28:26 +08:00
Hui Li 460ae42c09 [TD-1203] 2020-08-27 16:20:48 +08:00
Shengliang Guan c225051429
Merge pull request #3257 from taosdata/hotfix/TD-1009 
fixbug connection killing led floating point exception
 2020-08-27 15:39:53 +08:00
Haojun Liao d5abee89dd [td-255] fix compiler error 2020-08-27 15:04:19 +08:00
Haojun Liao 13cd54637b [td-255] fix compiler error 2020-08-27 14:50:53 +08:00
yihaoDeng 65f750a087 fixbug connection killing led floating point exception 2020-08-27 06:47:59 +00:00
Shengliang Guan b3a78f8fea Merge remote-tracking branch 'origin/master' into hotfix/sync 2020-08-27 05:42:13 +00:00
Shengliang Guan 158f7b2ed6 TD-1201 change filesize from 32bits to 64bits 2020-08-27 05:42:02 +00:00
Shengliang Guan 383ca2f2cb Merge from master 2020-08-27 02:21:31 +00:00
Bomin Zhang 829caf39d3 td-1242: wait again if sem_wait returns EINTR 2020-08-27 10:12:54 +08:00
Bomin Zhang a393cc7524 fix td-1242 2020-08-27 09:26:31 +08:00
Shengliang Guan 942c70c5e0 minor changes 2020-08-26 13:27:43 +00:00
Shengliang Guan dd1278c6f9 TD-1090 remove version.c and add version to taos.dll 2020-08-26 19:08:07 +08:00
Haojun Liao 6e43fe5217 [td-621] 2020-08-26 18:24:25 +08:00
Shengliang Guan bd16bb3d23 TD-1214 change csharp driver in win32 2020-08-26 17:36:57 +08:00
Haojun Liao e1c7529961 Merge branch 'develop' into feature/query 2020-08-26 15:53:29 +08:00
Haojun Liao 53a7e3d62b [td-225] add test case for join query. 2020-08-26 15:51:52 +08:00
Shengliang Guan 06d188e982 minor changes 2020-08-26 06:47:19 +00:00