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
root 0f01ebf53b Merge remote-tracking branch 'origin/develop' into feature/http 2020-09-14 16:20:34 +08:00
Shengliang Guan 86230219af
Merge pull request #3513 from taosdata/bugfix/td-1359 
[TD-1359]<fix>: set recv timeout of accepted tcp socket to avoid infinite wait when peer send a corrupt message
 2020-09-14 16:19:45 +08:00
root 8aec38f659 Merge remote-tracking branch 'origin/develop' into feature/http 2020-09-14 16:18:49 +08:00
root 3af6d957ff TD-1311 2020-09-14 16:17:52 +08:00
Haojun Liao dc8b2e281f [td-1391]update the error msg. 2020-09-14 16:16:25 +08:00
Haojun Liao fbb76bb9b2 [td-1319] 2020-09-14 15:54:46 +08:00
Bomin Zhang cc7402b1a6 TD-1359: add recv timeout for accepted tcp socket 
this is a quick fix for td-1359, and perhaps also a fix for td-1420.
 2020-09-14 14:53:03 +08:00
Shengliang Guan 7dd32d26cf TD-1311 2020-09-14 06:49:00 +00:00
Haojun Liao 7d56810a6e [td-225] update test 2020-09-14 14:37:58 +08:00
Hongze Cheng 0f081ce06d fix TD-1431 2020-09-14 14:19:31 +08:00
Haojun Liao 08907fa401 Merge branch 'develop' into feature/query 2020-09-14 13:55:53 +08:00
Haojun Liao 2bf6b3de2d [td-225] update test 2020-09-14 13:54:52 +08:00
Shengliang Guan 2867c2d6f4
Merge pull request #3508 from taosdata/master 
Master
 2020-09-14 13:28:42 +08:00
Haojun Liao a39fbb1fd6 [td-1319] 2020-09-14 13:23:12 +08:00
Shengliang Guan eff4b5807a TD-1311 2020-09-14 04:50:45 +00:00
Shengliang Guan 21584e3069
Merge pull request #3501 from taosdata/test/TD-1410 
[TD-1410]test: add a tool for test JDBC Connector
 2020-09-13 20:54:02 +08:00
Haojun Liao 6e3affb923 [td-1319] 2020-09-13 00:52:14 +08:00
Shengliang Guan 01c69a6377 TD-1225 rename files 2020-09-12 15:02:21 +00:00
Shengliang Guan 11aed4209e TD-1311 2020-09-12 14:50:29 +00:00
zyyang e7af1188ed [TD-1410]test: add a tool for test JDBC Connector 2020-09-12 17:21:45 +08:00
Shengliang Guan a1527b6206 TD-1311 2020-09-12 08:13:12 +00:00
Shengliang Guan 6fb53b3052 TD-1311 2020-09-12 08:13:02 +00:00
Haojun Liao 5e8ff5103c Merge branch 'develop' into feature/query 2020-09-12 16:05:39 +08:00
Haojun Liao 2b1519c167 [td-1319] 2020-09-12 15:50:04 +08:00
Shengliang Guan 5fa8bc8063 Merge from freemine:with-http-parser 2020-09-12 02:10:02 +00:00
root f20723b057 TD-1284 2020-09-11 20:53:42 +08:00
root 772f5b577e TD-1284 mnode illegal pointer operation 2020-09-11 19:24:46 +08:00
Haojun Liao a28d714d98 td-1423] fix bugs in group by nchar/binary columns. #3476 2020-09-11 18:35:10 +08:00
Shengliang Guan 19e51adb70 TD-1272 fix unaddressable errors 2020-09-11 08:49:05 +00:00
Shengliang Guan 352cde9886
Merge pull request #3480 from taosdata/hotfix/td-1350 
Hotfix/td 1350
 2020-09-11 11:58:09 +08:00
Haojun Liao 562f6ce245 [td-1416] 2020-09-11 11:22:45 +08:00
Haojun Liao 9a87f3ccd3 [td-1416] 2020-09-11 11:05:10 +08:00
root 6c9173824a Merge remote-tracking branch 'origin/develop' into feature/crash 2020-09-11 10:50:28 +08:00
root 7334f5196e TD-1382 2020-09-11 10:50:17 +08:00
Haojun Liao b9566424ba [td-1412] 2020-09-11 10:22:42 +08:00
zyyang-taosdata 54143e0669 Implement the TSDBStatement.getConnection function 2020-09-11 00:02:58 +08:00
Shengliang Guan e899d6850b
Merge pull request #3466 from taosdata/feature/crash 
add syncInit and syncCleanUp functions
 2020-09-10 23:53:47 +08:00
Shengliang Guan 631dc77e09 TD-1382 2020-09-10 15:05:08 +00:00
Haojun Liao dd368d91af [td-1412] 2020-09-10 22:12:17 +08:00
Shengliang Guan 59711f9d98 TD-1382 2020-09-10 13:49:53 +00:00
root fa5d57a49a TD-1382 2020-09-10 20:10:29 +08:00
Haojun Liao d74478425b [td-1411] 2020-09-10 17:16:28 +08:00
Haojun Liao a30dd56278 [td-225] 2020-09-10 15:03:59 +08:00
Haojun Liao b60e66bb78 [td-1409] remove the dependency of JDBC driver on common-util package. #3459 2020-09-10 14:53:32 +08:00
Hongze Cheng 1d35b18642 fix TD-1387 2020-09-10 14:43:49 +08:00
Shuduo Sang ae20e56239 [TD-1407] <fix> fix an issue coverity reports getenv() return a string with unknown size. 2020-09-10 14:18:17 +08:00
root a0f01c7dfe minor changes 2020-09-10 14:07:40 +08:00
Shengliang Guan eccaf2431e Merge remote-tracking branch 'origin/develop' into feature/crash 2020-09-10 05:56:03 +00:00
Shengliang Guan 4e18484b30 TD-1382 TD-1383 2020-09-10 05:52:26 +00:00
Haojun Liao 8271462385 [td-1369] 2020-09-10 13:05:59 +08:00
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