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

6573 Commits

Author SHA1 Message Date
Hongze Cheng f879d6b0f6 merge develop 2020-10-28 18:19:19 +08:00
Haojun Liao 358279cb1b [td-1826] 2020-10-28 18:13:31 +08:00
Bomin Zhang fa418c3af9 fix TD-1834 2020-10-28 18:05:00 +08:00
Hongze Cheng 951a0df6b9 Merge branch 'develop' into feature/update 2020-10-28 18:00:58 +08:00
Bomin Zhang 7f81867040 [TD-1807]<fix>: interval window can have more rows 2020-10-28 16:49:17 +08:00
freemine f6eefa9994 1. remove obsolete codes in tests/main.c 
2. linux port of todbcinst
 2020-10-28 15:03:50 +08:00
Shuduo Sang 6d690442b9
Merge pull request #3709 from huskar-t/develop 
add hivemq-tdengine-extension
 2020-10-28 14:54:14 +08:00
Haojun Liao 85518f5186 [td-1834] 2020-10-28 14:35:21 +08:00
Hui Li d3ef59d466 [NONE] 2020-10-28 13:57:50 +08:00
freemine cc496e12bb add todbcinst to help user install/uninstall taos odbc driver 2020-10-28 13:47:32 +08:00
Shengliang Guan 11c9402779 TD-1780 2020-10-28 05:40:03 +00:00
huskar_t 229d8f3799 remove submodule jdsl 2020-10-28 11:19:59 +08:00
Hongze Cheng f403fc0c6e fix TD-1835 2020-10-28 11:11:25 +08:00
Shengliang Guan 582cacc5b9 TD-1732 2020-10-28 09:39:07 +08:00
Shengliang Guan e0c0b4f1e1 Merge remote-tracking branch 'origin/develop' into feature/ep 2020-10-28 09:37:47 +08:00
Shengliang Guan bbfafc6b45
Merge pull request #4021 from taosdata/feature/table 
TD-1832
 2020-10-27 23:37:24 +08:00
Haojun Liao 6ee9d124e6 [td-1830] 2020-10-27 23:32:16 +08:00
Jeff Tao 1c182ac765 restore the deleted error codes 2020-10-27 15:14:57 +00:00
Haojun Liao b736211317 [td-1829] 2020-10-27 23:04:51 +08:00
Haojun Liao 9898b2f483 [td-225] reset retry to 0 for each HB 2020-10-27 22:59:26 +08:00
Shengliang Guan 4ee2662c01 TD-1832 2020-10-27 14:18:07 +00:00
Shengliang Guan dab726abe9 TD-1832 2020-10-27 14:16:26 +00:00
freemine 8b1468421f Merge branch 'odbc-win' into odbc 2020-10-27 22:12:58 +08:00
freemine 03056bca92 Merge remote-tracking branch 'upstream/develop' into odbc-win 2020-10-27 21:54:16 +08:00
freemine 5cadfd3037 .sql -> .stmts, because of .gitignore 2020-10-27 21:52:03 +08:00
freemine 1eec11e987 first version of runnable win odbc driver 2020-10-27 21:41:16 +08:00
Shengliang Guan 580df53561 TD-1762 2020-10-27 12:09:29 +00:00
Jeff Tao c6ecb52c55 error code 2020-10-27 11:38:41 +00:00
Jeff Tao ce860ec39c remove the windows compiling error 2020-10-27 11:27:41 +00:00
Jeff Tao 9307ddac33 Merge branch 'develop' into feature/race 2020-10-27 11:12:32 +00:00
Shengliang Guan d2c852c8e9 TD-1762 2020-10-27 11:12:03 +00:00
Haojun Liao 67c3831601 [td-225] refactor. 2020-10-27 17:34:28 +08:00
Haojun Liao bc602464b0 [td-1815] 2020-10-27 17:33:19 +08:00
Hongze Cheng 4bc05d33eb hotfix/TD-1685 2020-10-27 07:41:01 +00:00
Shengliang Guan 9b7f04b059 TD-1762 2020-10-27 05:42:46 +00:00
freemine 4e402502a2 1. bugFix: memory leakage 
2. satisfy CI
 2020-10-27 13:33:59 +08:00
freemine e5a36038c9 Merge remote-tracking branch 'upstream/develop' into odbc 2020-10-27 13:27:52 +08:00
Jeff Tao ceeec650a1 first version 2020-10-27 03:50:32 +00:00
Shengliang Guan fb95b01122
Merge pull request #4000 from taosdata/hotfix/TD-1732 
Hotfix/td 1732
 2020-10-27 10:51:05 +08:00
Shengliang Guan dd151241b0
Merge pull request #4002 from taosdata/feature/query 
Feature/query
 2020-10-27 10:50:38 +08:00
Haojun Liao ad49ef25d9 [td-225] refactor 2020-10-27 10:22:48 +08:00
Haojun Liao 092da36952 [td-225] fix bugs by regression test. 2020-10-27 10:22:12 +08:00
yihaoDeng ff9eb115c7 TD-1732 2020-10-26 23:31:50 +00:00
yihaoDeng 80b22baabd TD-1732 2020-10-26 22:42:54 +00:00
Shengliang Guan cfdc8c1502 Merge branch 'feature/ep' of https://github.com/taosdata/TDengine into feature/ep 2020-10-26 20:48:08 +08:00
Shengliang Guan 2861c02640 TD-1762 2020-10-26 12:45:49 +00:00
freemine 9be73e7b6c remove obsoletes 2020-10-26 19:58:50 +08:00
freemine 48b1fd65f1 header file workaround for win_flex 2020-10-26 19:53:15 +08:00
Shengliang Guan dbaac1a170
Merge pull request #3999 from taosdata/feature/query 
[td-225] fix bug found by regression test.
 2020-10-26 19:35:52 +08:00
freemine 3b13a3f053 Merge remote-tracking branch 'upstream/develop' into odbc 2020-10-26 18:59:33 +08:00
Haojun Liao 00ecc593bd [td-225] fix bug found by regression test. 2020-10-26 18:37:32 +08:00
Shengliang Guan 6c009cd042
Merge pull request #3995 from taosdata/feature/query 
Feature/query
 2020-10-26 17:48:46 +08:00
Shengliang Guan 57f15cfcdf compile error in windows 2020-10-26 17:15:35 +08:00
Haojun Liao fcf59dd33d [td-225] fix compiler error. 2020-10-26 16:49:02 +08:00
Haojun Liao fc40984a69 [td-225] fix compiler error. 2020-10-26 16:44:44 +08:00
Haojun Liao e53c433569 [td-225] fix compiler error. 2020-10-26 16:41:32 +08:00
Haojun Liao c615ca4ce6 [td-225] fix compiler error. 2020-10-26 16:06:53 +08:00
Haojun Liao c5087aa444 [td-225] fix compiler error. 2020-10-26 16:06:23 +08:00
Haojun Liao 2e9fbee43c [td-225] fix compiler error. 2020-10-26 15:54:50 +08:00
Haojun Liao afa66c6b77 [td-225] fix compiler error. 2020-10-26 15:32:23 +08:00
Haojun Liao 5ce1ff42e3 [td-225] fix compiler error. 2020-10-26 15:26:15 +08:00
Haojun Liao 0f68ec7387 [td-225] fix compiler error. 2020-10-26 14:54:34 +08:00
Haojun Liao 92eafa0719 Merge branch 'develop' into feature/query 2020-10-26 14:49:48 +08:00
Haojun Liao b1c2ff74b7 [td-1569] 2020-10-26 14:44:56 +08:00
Haojun Liao 00cc76aed9 [td-1569] 2020-10-26 14:42:56 +08:00
Bomin Zhang 921e3a3fab fix TD-1653 2020-10-26 13:40:40 +08:00
freemine 1a5ec2e2ba prefer unsigned char * than void *, because we will add offset to the pointer 2020-10-26 11:31:27 +08:00
Haojun Liao 6c0e357291 [td-225] update CMakeLists.txt 2020-10-26 11:25:04 +08:00
freemine 776e0a39c8 add -Wconversion and refactor accordingly 2020-10-26 11:08:33 +08:00
yihaoDeng 370bfa8e46 TD-1732 2020-10-26 01:30:17 +00:00
freemine 54ed76ec2d start to enable build in windows 2020-10-26 08:22:48 +08:00
freemine 7137bf8995 disable C4091 2020-10-25 22:34:20 +08:00
Jeff Tao 0f9fd9a131 first version 2020-10-25 13:17:23 +00:00
Haojun Liao 5b23931687 [td-1739] 2020-10-24 23:07:12 +08:00
Haojun Liao 36ae97a0e5 [td-1373] refactor 2020-10-24 17:13:00 +08:00
Haojun Liao 6532bced2b [td-1373] fix invalid write and memory leaks 2020-10-24 17:00:48 +08:00
Haojun Liao 6b49d26693 [td-1373] 2020-10-24 16:45:09 +08:00
Haojun Liao e8223aef40 [td-1373] 2020-10-24 16:44:18 +08:00
Haojun Liao 79906e6a99 [td-1373] 2020-10-24 16:39:17 +08:00
Haojun Liao f4be8aae0e [td-1373] 2020-10-24 16:37:24 +08:00
Haojun Liao 289c125bf8 [td-1373] 2020-10-24 16:30:36 +08:00
Haojun Liao c43e13ab0b [td-1373] 2020-10-24 16:11:45 +08:00
Haojun Liao 88de14360a [td-1373] fix memory leak 2020-10-24 15:55:55 +08:00
Haojun Liao c1bea6666d [td-1373] 2020-10-24 15:52:30 +08:00
Haojun Liao c6cc433caf [td-1373] fix memory leak 2020-10-24 14:44:42 +08:00
Haojun Liao 09c39cd2b8 [td-1373] fix memory leak 2020-10-24 14:37:24 +08:00
Haojun Liao c6b3018419 [td-1373] 2020-10-24 10:14:46 +08:00
Haojun Liao efc9c32edd [td-1373] 2020-10-23 23:41:24 +08:00
Haojun Liao 9b2a53cec2 [td-1373] 2020-10-23 23:19:21 +08:00
Haojun Liao 3fff8aba71 [td-1373] 2020-10-23 22:54:47 +08:00
freemine 2170b69e78 Merge remote-tracking branch 'upstream/develop' into odbc 2020-10-23 20:00:02 +08:00
freemine 5c81c19808 refactor and c test case 2020-10-23 19:58:10 +08:00
Shengliang Guan bcc8b52308
Merge pull request #3975 from taosdata/bugfix/td-1776 
[TD-1776]<fix>: do not report invalid qhandle to user
 2020-10-23 17:53:30 +08:00
Hongze Cheng 1f279b72e8 fix TD-1759 2020-10-23 09:34:22 +00:00
Bomin Zhang f49b447519 fix TD-1776 2020-10-23 16:29:32 +08:00
Haojun Liao a89368e6b6 [td-1373] 2020-10-23 16:24:00 +08:00
Haojun Liao 30642fa1c6 [td-1373] 2020-10-23 16:10:02 +08:00
Haojun Liao d5df0e03f4 [td-1373] 2020-10-23 15:13:34 +08:00
Haojun Liao 0e75d3983f [td-1373] 2020-10-23 15:01:04 +08:00
Haojun Liao ce9dae6768 [td-1373] 2020-10-23 14:37:00 +08:00
Haojun Liao 3833df542a [td-1373] 2020-10-23 14:11:01 +08:00
Shengliang Guan 1f5f1e9294 TD-1710 2020-10-23 06:01:39 +00:00
Haojun Liao 503c7321fd [td-1373] 2020-10-23 13:59:30 +08:00
Haojun Liao b6d292da99 [td-1373] 2020-10-23 13:53:23 +08:00
Haojun Liao 186543bc15 [td-1373] 2020-10-23 13:52:48 +08:00
Haojun Liao b137e6e946 [td-1373] 2020-10-23 13:49:54 +08:00
Haojun Liao 22a6c4f13c [td-1373] 2020-10-23 12:55:43 +08:00
Haojun Liao 7582b7e4df [td-1373] 2020-10-23 12:45:17 +08:00
Shengliang Guan 546d3b128e
Merge pull request #3968 from taosdata/patch/TD-1772 
TD-1772
 2020-10-23 09:58:34 +08:00
Hui Li f830a04240 change version number 2020-10-23 09:25:07 +08:00
Haojun Liao 204ba970f1 [td-1373] 2020-10-23 00:28:25 +08:00
tanxuefeng 73aeb4b691 update readme 2020-10-22 23:33:11 +08:00
freemine f8c905211a scanner pattern 2020-10-22 23:22:46 +08:00
Haojun Liao e3d9054f46 [td-1373] 2020-10-22 23:14:01 +08:00
freemine e6fba26472 add flex-scanner to parse driver connection string 2020-10-22 23:05:40 +08:00
tanxuefeng 576dc52b87 update hivemq extension 2020-10-22 22:45:14 +08:00
Jeff Tao 4bb83933b2 remove the pollFd check 2020-10-22 13:36:54 +00:00
freemine aadbd94fb1 bugFix: fraction calc 2020-10-22 20:29:55 +08:00
freemine 4ca01fa2d0 Merge remote-tracking branch 'upstream/develop' into odbc 2020-10-22 20:19:43 +08:00
freemine 15364b8e78 refactor 2020-10-22 20:19:18 +08:00
Jeff Tao 0057a138ee socket data type 2020-10-22 10:19:01 +00:00
Jeff Tao be142916e6 TD-1772 
pThreadObj is freed when thread exits
 2020-10-22 09:57:44 +00:00
Haojun Liao 18f646b798 [td-1373] 2020-10-22 17:49:49 +08:00
Haojun Liao daac5036fc [td-1373] 2020-10-22 17:46:08 +08:00
Haojun Liao b90807cec9 [td-1373] 2020-10-22 17:33:43 +08:00
Haojun Liao e06d7083c1 [td-1373] 2020-10-22 16:45:17 +08:00
Shengliang Guan e2661083f4 TD-1754 #3917 2020-10-22 16:19:43 +08:00
Haojun Liao ad499c5541 [td-1373] 2020-10-22 15:53:25 +08:00
Haojun Liao d3522fecf4 [td-1373] 2020-10-22 15:52:08 +08:00
Haojun Liao 0f2c6f3181 [td-1373] 2020-10-22 15:49:15 +08:00
Haojun Liao 0569672503 [td-1373] 2020-10-22 14:40:17 +08:00
Haojun Liao de006209f9 [td-1373] 2020-10-22 14:32:31 +08:00
Haojun Liao 8fb14fc5cb [td-1373] 2020-10-22 14:08:11 +08:00
Haojun Liao d1a84d027c [td-1373] 2020-10-22 12:42:23 +08:00
Haojun Liao 8668c15f98 [td-1373] add log 2020-10-22 12:27:01 +08:00
yihaoDeng 44b6dd9a3f TD-1720 2020-10-21 22:57:49 +00:00
Haojun Liao 4c13db3eec [td-1770] 2020-10-21 18:01:00 +08:00
Shengliang Guan 57417c7f80 Merge from develop into feature/os 2020-10-21 09:08:45 +00:00
Shengliang Guan 5c1151e33c
Merge pull request #3948 from taosdata/bugfix/TD-1758 
[TD-1758]<fix>: possible crash when insert data to two tables in one statement
 2020-10-21 17:05:30 +08:00
Shengliang Guan 6ea101d58d
Merge pull request #3950 from taosdata/feature/query 
Feature/query
 2020-10-21 17:05:15 +08:00
Shengliang Guan 9101e50591 fix compile errors 2020-10-21 09:02:25 +00:00
Shengliang Guan 7a82c2c64a Merge remote-tracking branch 'origin/develop' into feature/os 2020-10-21 09:02:01 +00:00
Shengliang Guan c7d9571088 #3922 2020-10-21 08:29:03 +00:00
Shengliang Guan 58243ab38e
Merge pull request #3748 from freemine/namedtype 
prefer named-type rather than void-type to reduce typos
 2020-10-21 16:14:48 +08:00
Haojun Liao b8e1f3d3b4 [td-225] fix compiler error. 2020-10-21 16:07:10 +08:00
Haojun Liao 320296a6b5 [td-225] merge develop 2020-10-21 15:57:38 +08:00
Haojun Liao fccb4851de [td-225] 2020-10-21 15:48:16 +08:00
Shengliang Guan 19cced6f0e TD-1768 2020-10-21 15:29:44 +08:00
Haojun Liao c3a31c681d [td-1765] 2020-10-21 15:11:57 +08:00
Bomin Zhang 478fd09f28 fix TD-1758 2020-10-21 14:59:49 +08:00
Haojun Liao a170da7201 [td-1664] 2020-10-21 13:49:31 +08:00
Shengliang Guan 55385f56d7
Merge pull request #3931 from taosdata/bugfix/td-1471 
[TD-1471]<fix>: empty result was returned if a database was dropped during query
 2020-10-21 12:38:40 +08:00
Shengliang Guan 196b03f1bd remove debug codes add by hjliao 2020-10-21 03:37:24 +00:00
Shengliang Guan 374987e039 TD-1746 2020-10-21 03:29:14 +00:00
Shengliang Guan 438aef99f7 TD-1661 2020-10-21 03:07:22 +00:00
Shengliang Guan 6137a2b377 TD-1746 2020-10-21 03:07:16 +00:00
Haojun Liao 6b985a6e86 [td-1764] fix memory leak. 2020-10-21 10:51:46 +08:00
Bomin Zhang 820bf89a2e TD-1471: use new error code when qhandle is null 2020-10-21 10:42:09 +08:00
Haojun Liao 58e1f85249 Merge branch 'develop' into feature/query 2020-10-21 10:13:42 +08:00
Haojun Liao 8e188274f0 [td-1764] 2020-10-21 10:08:37 +08:00
freemine fb17a79e3c Merge remote-tracking branch 'upstream/develop' into odbc 2020-10-20 19:36:23 +08:00
freemine 1a32f1bb58 temporary commit 2020-10-20 19:30:56 +08:00
Shengliang Guan 7a77d047c7
Merge pull request #3765 from freemine/odbc 
add odbc connector
 2020-10-20 18:26:21 +08:00
Bomin Zhang e491a8908c fix TD-1471 2020-10-20 15:04:47 +08:00
Haojun Liao beb6599256 [td-1756] 2020-10-20 14:07:28 +08:00
Haojun Liao e910cae1ec [td-1756] 2020-10-20 14:06:03 +08:00
Haojun Liao 7c4276cb05 [td-1752] 2020-10-20 13:44:05 +08:00
zyyang ef419e4c4b update taos-jdbcdriver version 2020-10-20 12:38:37 +08:00
Haojun Liao 959c3405a0 [td-1756] add error check 2020-10-20 11:41:35 +08:00
zyyang c468ca889d Merge branch 'develop' into feature/TD-1701 2020-10-20 11:08:59 +08:00
Haojun Liao 05325532ec [td-1747] 2020-10-20 11:01:00 +08:00
zyyang 6ebd50e3cf COPY the correct taos-jdbcdriver to target dir 2020-10-20 10:36:55 +08:00
zyyang c9a7931bea update sqlSpeller 2020-10-20 10:19:02 +08:00
Haojun Liao 67ffdd17be [td-1747] 2020-10-19 23:32:04 +08:00
Haojun Liao aa55054e36 [td-1747] 2020-10-19 23:19:44 +08:00
Haojun Liao 2cac39d665 [td-225] reduce tableMeta size 2020-10-19 18:20:33 +08:00
Hui Li 69d8861faf [TD-1750] 2020-10-19 16:56:33 +08:00
liuyq-617 1c52e22bd8 Merge branch 'hotfix/test' of github.com:taosdata/TDengine into hotfix/test 2020-10-19 16:47:18 +08:00
liuyq-617 7c6609e6c2 [TD-1750]<fix> add python2 connectionerror 2020-10-19 16:47:05 +08:00
Hui Li de2b0de6ee [NONE] 2020-10-19 16:46:41 +08:00
Hui Li 90bdea4c5f Merge branch 'hotfix/test' of https://github.com/taosdata/TDengine into hotfix/test 2020-10-19 16:37:57 +08:00
Haojun Liao fb0456ca4c [td-1747] reduce tableMeta size 2020-10-19 16:26:28 +08:00
liuyq-617 fa7b5f047c <fix> add python connectionerror 2020-10-19 16:15:54 +08:00
Haojun Liao 3abaaabeee [td-225] 2020-10-19 11:33:49 +08:00
Shengliang Guan 006a832c7d Merge remote-tracking branch 'origin/develop' into feature/os 2020-10-19 03:22:10 +00:00
Shengliang Guan 4941318011
Merge pull request #3898 from taosdata/hotfix/td-1733 
TD-1733
 2020-10-19 10:59:28 +08:00
Shengliang Guan 068bb6c21c
Merge pull request #3903 from taosdata/hotfix/TD-1741 
fix TD-1741
 2020-10-19 10:59:07 +08:00
Shengliang Guan 0b3fb779c0 TD-1743 2020-10-19 02:48:16 +00:00
Shengliang Guan e5633b6ad3 TD-1743 When deleting a database, tables in other databases may be deleted by mistake 2020-10-19 02:23:24 +00:00
Haojun Liao 40c7208cc2 [td-225] 2020-10-19 09:53:20 +08:00
Hongze Cheng e1f52dacb1 fix TD-1741 2020-10-18 23:19:03 +08:00
freemine 196106ade5 reenable jdbc 2020-10-18 20:26:14 +08:00
freemine 4d7a69d190 1. support fraction in timestamp 
2. trying to use tsdb_xxx_to_yyy
 2020-10-18 20:22:47 +08:00
Haojun Liao b3165d4193 [td-225] 2020-10-18 15:38:18 +08:00
freemine b0ff31e1a2 remove obsolete code 2020-10-18 14:18:15 +08:00
freemine a1a43cede0 Merge remote-tracking branch 'upstream/develop' into odbc 2020-10-18 14:03:53 +08:00
yihaoDeng 91782c5b99 TD-1733 2020-10-18 01:04:17 +00:00
freemine 1e3e85c0da Merge branch 'namedtype' of github.com:freemine/TDengine into namedtype 2020-10-18 06:07:37 +08:00
freemine b3f67174dc Merge remote-tracking branch 'upstream/develop' into namedtype 2020-10-18 04:59:38 +08:00
Haojun Liao 1e8461e66c [td-225] 2020-10-18 02:24:29 +08:00
Haojun Liao a0a274e8ba [td-225] 2020-10-18 02:16:36 +08:00
Haojun Liao 134d1f6434 [td-225] 2020-10-18 02:03:10 +08:00
Haojun Liao 5df7a81160 [td-225] 2020-10-18 01:14:01 +08:00
Haojun Liao 5adcf14d6e [td-225] 2020-10-18 00:45:49 +08:00
Haojun Liao adcbb0fe40 [td-225] 2020-10-18 00:23:19 +08:00
Haojun Liao 95adf3ea61 [td-225] 2020-10-17 23:47:40 +08:00
Haojun Liao d069a35683 [td-225] add more info in log. 2020-10-17 22:38:07 +08:00
Haojun Liao a87717bb7d [td-225] 2020-10-17 16:35:12 +08:00
Shengliang Guan 64b75f55a7 compile error in vs2013 2020-10-17 16:16:28 +08:00
haojun Liao ab96870bd8
Merge branch 'develop' into namedtype 2020-10-17 13:44:08 +08:00
Shengliang Guan a0fe1d3c34
Merge pull request #3893 from taosdata/feature/query 
Feature/query
 2020-10-17 13:29:22 +08:00
Haojun Liao d4ad59df86 [td-1720] 2020-10-17 13:05:17 +08:00
Haojun Liao 513eb4d7eb [td-225] 2020-10-17 13:03:59 +08:00
Haojun Liao e7fb3fdc53 [td-225] refactor codes. 2020-10-17 13:02:19 +08:00
Bomin Zhang a9e5591292 fix TD-1709 2020-10-17 10:26:49 +08:00
freemine 273b8e1732 msvc: C4244 2020-10-17 07:37:21 +08:00
freemine 964729a9fd msvc: C4244 2020-10-17 07:17:45 +08:00
freemine a6c918bf42 1. msvc: C4244, conversion-loss-of-data 
2. msvc: C4477, "%ld" => "%" PRId64 ""
 2020-10-17 06:50:28 +08:00
freemine 1df2739281 Merge remote-tracking branch 'upstream/develop' into odbc 2020-10-17 06:25:25 +08:00
freemine 2436485e9b test case: with user-provided type other than table field type 2020-10-17 06:25:17 +08:00
freemine 1c52e6598e 1. add batch-insert 
2. allow buffer-type conversion within taos
 2020-10-17 06:11:21 +08:00
Haojun Liao 15b2e41d7a [td-1720] 2020-10-16 23:22:42 +08:00
Haojun Liao adb8b05129 Merge branch 'feature/query' of https://github.com/taosdata/TDengine into feature/query 2020-10-16 23:05:16 +08:00
Haojun Liao 59abdffcd7 [td-1720] 2020-10-16 23:01:02 +08:00
Haojun Liao ab3133f808 [td-1712] 2020-10-16 22:59:14 +08:00
Shengliang Guan b4472552e6
Merge pull request #3886 from taosdata/feature/os 
Feature/os
 2020-10-16 22:12:36 +08:00
Shengliang Guan 51c09bb1ed TD-1530 aligin double in arm32 2020-10-16 18:56:15 +08:00
Shengliang Guan 2490995d6c TD-1530 fix invalid read/write while execute tags_filter.sim 2020-10-16 09:52:49 +00:00
Shengliang Guan bbbb87ccb9 Merge remote-tracking branch 'origin/develop' into feature/query 2020-10-16 16:03:27 +08:00
Haojun Liao 752844b1e0 [td-1728] fix memory leaks 2020-10-16 15:10:13 +08:00
Shengliang Guan 0bb3794b2d TD-1725 2020-10-16 14:29:25 +08:00
Shengliang Guan b1cc403da1 TD-1725 2020-10-15 18:23:28 +08:00
Shengliang Guan d0935c02f6
Merge pull request #3862 from taosdata/bugfix/TD-1706 
[TD-1706]<fix>: leak of connection id
 2020-10-15 15:05:44 +08:00
Shengliang Guan e94b5f1f2f
Merge pull request #3861 from taosdata/feature/sync 
[TD-1652]: Possible loss of data when the synchronization state is switched
 2020-10-15 13:25:28 +08:00
Shengliang Guan df051e640d
Merge branch 'develop' into feature/query 2020-10-15 12:13:49 +08:00
Shengliang Guan 1531995307
Merge pull request #3854 from taosdata/hotfix/TD-1711 
[TD-1711]<fix>: func taos_validate_sql cause deadlocked
 2020-10-15 12:11:06 +08:00
Shengliang Guan 3f52d74a8e TD-1696 2020-10-15 03:23:47 +00:00
Bomin Zhang 89a76a0d66 fix td-1706: leak of connection id 2020-10-15 09:47:37 +08:00
Haojun Liao db951b38f3 [td-1637]. 2020-10-14 23:47:36 +08:00
Haojun Liao 83a1d5e54e [td-225] refactor code. 2020-10-14 23:12:17 +08:00
Haojun Liao 6634c97552 Merge remote-tracking branch 'origin/feature/query' into feature/query 2020-10-14 23:11:32 +08:00
Haojun Liao b6786bc661 [td-1637] 2020-10-14 23:09:16 +08:00
Shengliang Guan 53774be0ca add debug info for sync module 2020-10-14 22:41:17 +08:00
Shengliang Guan 6f004e4c7a TD-1652 2020-10-14 22:27:19 +08:00
Shengliang Guan 8623f14513 TD-1652 2020-10-14 22:20:26 +08:00
Shengliang Guan 125d147b3d Merge remote-tracking branch 'origin/develop' into feature/crash 2020-10-14 11:49:44 +00:00
Shengliang Guan 390cafebdf Merge remote-tracking branch 'origin/feature/crash' into feature/query 2020-10-14 11:42:03 +00:00
Shengliang Guan d0175e6ea0 TD-1719 2020-10-14 19:38:15 +08:00
Haojun Liao d838bacdbe [td-1637] 2020-10-14 18:48:24 +08:00
Shengliang Guan 5efac410cb
Merge pull request #3853 from taosdata/feature/crash 
TD-1667
 2020-10-14 15:27:55 +08:00
Shengliang Guan e67144cb3a
Merge pull request #3850 from taosdata/feature/query 
Feature/query
 2020-10-14 15:11:45 +08:00
Shengliang Guan 938f0773dd
Merge pull request #3851 from taosdata/release/s103 
Release/s103
 2020-10-14 15:11:10 +08:00
Shengliang Guan e9d283db16 TD-1667 2020-10-14 15:06:21 +08:00
Haojun Liao 4c22b72d06 [td-225] 2020-10-14 14:31:46 +08:00
freemine e7fb328524 Merge remote-tracking branch 'upstream/develop' into odbc 2020-10-14 14:05:21 +08:00
Haojun Liao 233437a75d Merge remote-tracking branch 'origin/release/s103' into release/s103 2020-10-14 13:25:04 +08:00
Haojun Liao 7f70eff949 [td-1716] enable repeatably close connection to avoid close the connection twice in c# driver #3737 2020-10-14 13:24:41 +08:00
Haojun Liao 2a9855bbaf [td-225] fix bugs found by tsim 2020-10-14 13:02:23 +08:00
Haojun Liao 0066dc9ac0 [td-1716] 2020-10-14 12:43:45 +08:00
Hui Li 90c2b1f527 include file for static packaging 2020-10-14 11:11:41 +08:00
Shengliang Guan 9f88152088 TD-1707 #3834 2020-10-14 10:38:14 +08:00
Haojun Liao 9864f6ebf1 Merge remote-tracking branch 'origin/feature/query' into feature/query 2020-10-13 23:26:53 +08:00
Haojun Liao e66cb7d967 [td-225] 2020-10-13 23:26:20 +08:00
freemine d5f25541ca Merge remote-tracking branch 'upstream/develop' into odbc 2020-10-13 22:38:22 +08:00
freemine 7c04c9b380 1. bugFix: nchar/binary field bytes 
2. report error for parameterised-select
 2020-10-13 22:31:59 +08:00
yihaoDeng 58dafe2de2 TD-1711 2020-10-13 12:24:38 +00:00
Shengliang Guan 3bbbbdf561 Merge remote-tracking branch 'origin/develop' into feature/query 2020-10-13 19:33:23 +08:00
Shengliang Guan 931ce0a4bb
Merge pull request #3827 from taosdata/hotfix/TD-1688 
Hotfix/td 1688
 2020-10-13 19:13:17 +08:00
Haojun Liao daea8133ed [td-255] compact result for all show command. 2020-10-13 18:22:07 +08:00
freemine 941c80f34f Merge remote-tracking branch 'upstream/develop' into odbc 2020-10-13 15:27:33 +08:00
freemine 8d325f1693 1. support SQLWCHAR 
2. more precise error message, according ODBC doc
 2020-10-13 15:20:56 +08:00
Shengliang Guan f6e26868c5 TD-1652 2020-10-13 14:35:27 +08:00
Haojun Liao 49ae6c39e5 [td-225] 2020-10-13 13:26:32 +08:00
Haojun Liao d4a18dd68c [td-225] 2020-10-13 13:14:50 +08:00
Haojun Liao 3caf1ffc04 [td-225] 2020-10-13 11:53:16 +08:00
Haojun Liao 66ab0cd04c [td-225] 2020-10-13 11:47:45 +08:00
Haojun Liao c6479a148a [td-225] merge develop 2020-10-13 11:35:40 +08:00
Haojun Liao 25ee3b480b [td-225] refactor client code 2020-10-13 11:18:11 +08:00
Shengliang Guan c85c597b97 TD-1652 2020-10-13 10:14:51 +08:00
yihaoDeng 2fd7ac5f50 TD-1688 2020-10-12 17:35:43 +00:00
Shengliang Guan f079aa7599 Merge remote-tracking branch 'origin/develop' into patch/TD-1669 2020-10-12 12:18:25 +00:00
Shengliang Guan 83f02fe202
Merge pull request #3816 from taosdata/hotfix/test 
Hotfix/test
 2020-10-12 20:16:33 +08:00
Shengliang Guan 8eb559e6a3
Merge pull request #3817 from taosdata/master 
Merge from master into develop
 2020-10-12 20:16:06 +08:00
Shengliang Guan 4d30dc9db1 TD-1657 2020-10-12 12:08:19 +00:00
Hui Li 5d64e7ed53 [TD-1625] 2020-10-12 18:43:14 +08:00
Hui Li 2f9b68a977 [TD-1625] 2020-10-12 18:30:00 +08:00
Hui Li fa874237b2 [TD-1625] 2020-10-12 18:27:43 +08:00
Shengliang Guan 1abffd94be TD-1671 2020-10-12 10:18:16 +00:00
Shengliang Guan d8600ae91a
Merge pull request #3810 from taosdata/bugfix/td-1675 
[TD-1675]<fix>: #3768: server and client crash when drop a subscribed super table
 2020-10-12 17:56:00 +08:00
Shengliang Guan ccfed462dd TD-1671 2020-10-12 09:10:57 +00:00
Shengliang Guan d477429414 TD-1670 2020-10-12 07:55:41 +00:00
Hongze Cheng 9e8508d2a7 TD-1682 2020-10-12 07:55:08 +00:00
Shengliang Guan afb4aff651 TD-1671 2020-10-12 07:28:35 +00:00
Bomin Zhang ab1ee97122 fix td-1675 2020-10-12 14:56:46 +08:00
Hui Li fec9531bc3 change dockerfile for install package with version 2020-10-12 14:31:20 +08:00
Shengliang Guan 1b59ce04e9 TD-1671 2020-10-12 05:43:16 +00:00
Jeff Tao f7656ec7f7 Merge branch 'patch/TD-1669' of https://github.com/taosdata/TDengine into patch/TD-1669 2020-10-11 14:51:08 +00:00
Jeff Tao 77d2880d42 check the sync forward timer 2020-10-11 14:48:56 +00:00
Shengliang Guan b43ffec586 TD-1671 2020-10-11 21:17:38 +08:00
Shengliang Guan 2159c68e9a TD-1672 2020-10-11 16:39:52 +08:00
Shengliang Guan b772c35b45 TD-1673 2020-10-11 08:11:13 +00:00
Shengliang Guan 6f549a28fd Merge remote-tracking branch 'origin/feature/crash' into patch/TD-1669 2020-10-11 15:55:02 +08:00
Shengliang Guan ccb8ab9328 TD-1670 2020-10-11 07:51:17 +00:00
yihaoDeng f25158733f TD-1665 2020-10-11 04:38:43 +00:00
Jeff Tao 0825ce995e add debug info for sync 2020-10-11 03:52:37 +00:00
Jeff Tao 8ebbfedba7 TD-1669 
fix the bug for both TD-1669 and partial TD-1641
 2020-10-11 02:26:46 +00:00
freemine e88979de90 add python test code with pyodbc 2020-10-11 06:39:36 +08:00
Haojun Liao 6a88d306c8 [td-1641] 2020-10-10 22:38:56 +08:00
freemine 77703ac809 re-enable jdbc 2020-10-10 22:17:28 +08:00
freemine 38c8b06f55 Merge remote-tracking branch 'upstream/develop' into odbc 2020-10-10 22:16:23 +08:00
freemine f1f5c0c479 1. add SQLDriverConnect to let ODBC-aware software to communicate with 
such as pyodbc
2. SQLDescribeCol
3. more DATA-TYPE-convertions in SQLGetData
 2020-10-10 22:12:15 +08:00
Haojun Liao 83f8316e70 [td-1641] 2020-10-10 21:15:01 +08:00
Hui Li c1d31e5e25 release/s103 2020-10-10 20:09:00 +08:00
Haojun Liao 97e69185f6 [td-1641] 2020-10-10 18:44:24 +08:00
Haojun Liao 7720259011 [td-1641] 2020-10-10 18:15:19 +08:00
Haojun Liao 47a0bc2c71 [td-1641] 2020-10-10 16:33:41 +08:00
Haojun Liao 6f9a5ae42e Merge branch 'develop' into feature/query 2020-10-10 13:49:37 +08:00
Haojun Liao da9bf993bd [td-1641] 2020-10-10 13:48:31 +08:00
Haojun Liao df2d6ea1c0 [td-1637] 2020-10-10 13:46:33 +08:00
Haojun Liao 4b3254a380 [td-225] remove false assert 2020-10-10 10:23:22 +08:00
Haojun Liao f3250e62bd [td-1660] 2020-10-10 09:45:18 +08:00
Haojun Liao 0060a73e94 [td-1613] 2020-10-09 17:59:34 +08:00
Haojun Liao 584ad68967 Merge remote-tracking branch 'origin/release/s103' into release/s103 2020-10-09 17:11:19 +08:00
Haojun Liao 86b52dc952 [td-1576] 2020-10-09 17:10:50 +08:00
Haojun Liao acdc22ee11 [td-1613] 2020-10-09 13:44:16 +08:00
Haojun Liao b120f8ce71 [td-1655] 2020-10-09 13:21:28 +08:00
freemine 888e81acb3 Merge remote-tracking branch 'upstream/develop' into odbc 2020-10-08 22:38:49 +08:00
freemine 045175682a 1. typo correction in CMakeLists.txt 
2. fprint error message when SQLxxx failed in tcodbc
 2020-10-08 22:36:13 +08:00
Shengliang Guan 6875321877
Merge pull request #3762 from taosdata/bugfix/td-1249 
[TD-1249]<fix>:memory leak in rpc
 2020-10-08 21:30:20 +08:00
freemine 75786385a2 just add one more blank line to check if travis's happy with that, ref #add odbc connector #3765 2020-10-08 17:05:07 +08:00
freemine 60d66cfd57 remove trailing spaces 2020-10-08 16:01:05 +08:00
freemine 0aee002858 Merge remote-tracking branch 'upstream/develop' into odbc 2020-10-08 15:51:56 +08:00
freemine ac16f20314 1. adjust CMakeLists.txt to enabling checking unixodbc existence 
2. use install.sh to install odbcinst/odbc record in system
3. add packages (unixodbc/unixodbc-dev) to install in .travis.yml
 2020-10-08 15:47:55 +08:00
Shengliang Guan 42e7be57a4 TD-1652 2020-10-08 14:52:02 +08:00
freemine d33d693ef1 remove obsoletes, ignore->ignored for better understanding 2020-10-08 12:19:33 +08:00
freemine 12eafdd8f3 add prepare/bind/execute support 2020-10-08 12:11:20 +08:00
Bomin Zhang 8e2bb2c1e4 fix td-1249 2020-10-08 11:05:02 +08:00
freemine dc2df3a09e add Error support 2020-10-07 17:42:54 +08:00
Jeff Tao 3047456325 TD-1632 2020-10-07 09:41:11 +00:00
Jeff Tao 75767af7aa TD-1632 2020-10-07 02:08:40 +00:00
Jeff Tao 85020a59a5 Merge branch 'patch/TD-1632' of https://github.com/taosdata/TDengine into patch/TD-1632 2020-10-07 02:01:30 +00:00
Jeff Tao 756aa48077 TD-1632 2020-10-07 02:00:38 +00:00
freemine 36e5dac0eb add refcount 2020-10-07 08:38:07 +08:00
freemine ec04ef7b79 delay fetch 2020-10-07 08:08:34 +08:00
freemine 52f023c028 init odbc 2020-10-06 22:53:15 +08:00
Shengliang Guan 1e84441b7b Merge remote-tracking branch 'origin/develop' into patch/TD-1632 2020-10-06 21:00:36 +08:00
Jeff Tao 62fe32678f Merge branch 'patch/TD-1632' of https://github.com/taosdata/TDengine into patch/TD-1632 2020-10-06 11:47:16 +00:00
Jeff Tao 12687355c0 TD-1632 2020-10-06 11:46:33 +00:00
谭雪峰 eecc7daae2 add hivemq-tdengine-jdsl-extension 2020-10-06 17:49:58 +08:00
T_MAX a065d69d76
Merge pull request #4 from taosdata/develop 
merge
 2020-10-06 17:42:12 +08:00
Jeff Tao 7367b31275 TD-1645 2020-10-06 06:20:07 +00:00
Shengliang Guan 09838cfdd8 Merge remote-tracking branch 'origin/develop' into patch/TD-1632 2020-10-05 21:53:58 +08:00
freemine 231cc2963e remove void types 2020-10-04 20:27:04 +08:00
freemine 47a77371ee prefer named-type rather than void-type to reduce typos 2020-10-04 14:54:31 +08:00
Jeff Tao c608fba88e TD-1645 2020-10-03 04:30:02 +00:00
Jeff Tao a8b8ecb20e TD-1645 2020-10-02 14:56:54 +00:00
Shengliang Guan 38dc4f4d16 TD-1645 fix compile error in windotws 2020-10-02 13:31:15 +08:00
slguan baf580ee8b TD-1632 revert 2020-10-02 12:59:15 +08:00
Shengliang Guan aa6ff1f5dc Merge remote-tracking branch 'origin/develop' into patch/TD-1645 2020-10-02 12:54:48 +08:00
Haojun Liao ef1dc64667 [td-225] fix compiler error on windows 2020-10-02 11:12:46 +08:00
Haojun Liao b3574f294f Merge remote-tracking branch 'origin/feature/query' into feature/query 2020-10-02 11:12:13 +08:00
Haojun Liao 8fed6ecaa1 [td-225] fix compiler error on windows 2020-10-02 11:11:07 +08:00
Shengliang Guan 60688a0365
Merge pull request #3743 from taosdata/develop 
Merge from develop
 2020-10-02 08:50:28 +08:00
Shengliang Guan ccc32feb22 revert from TD-1632 2020-10-02 08:44:33 +08:00
Jeff Tao f949b732f5 TD-1645 2020-10-01 14:55:00 +00:00
Jeff Tao 30284cbe59 TD-1645 2020-10-01 14:48:10 +00:00
Jeff Tao 0e5cc6e46a TD-1645 2020-10-01 14:40:56 +00:00
Haojun Liao 7bf8c4489d [td-225] fix invalid read of hb 2020-10-01 15:36:13 +08:00
Haojun Liao 1f0f57cf38 [td-1283] 2020-09-30 23:50:46 +08:00
Shengliang Guan 87046ff6f7 Merge remote-tracking branch 'origin/develop' into patch/TD-1632 2020-09-30 17:34:59 +08:00
Shengliang Guan 6437b7fac5 TD-1530 2020-09-30 15:30:31 +08:00
Shengliang Guan 18a937de54 Merge remote-tracking branch 'origin/develop' into feature/os 2020-09-30 04:18:05 +00:00
Shengliang Guan a2a4680b16 Merge branch 'feature/os' of https://github.com/taosdata/TDengine into feature/os 2020-09-30 12:16:40 +08:00
Shengliang Guan 70e97fec8a minor changes 2020-09-30 12:15:14 +08:00
Shengliang Guan 4b9a1813a5 minor changs 2020-09-30 04:12:13 +00:00
Shengliang Guan c9152cb35f minor changes 2020-09-30 04:08:11 +00:00
Hongze Cheng d8991f1913 fix TD-1640 2020-09-30 11:02:52 +08:00
Jeff Tao 2d5f36851a TD-1632 2020-09-30 01:21:22 +00:00
Jeff Tao 85e87e02a7 TD-1628 2020-09-30 00:19:17 +00:00
jinzhao f7c06f24ad merge from taos/develop 2020-09-29 16:13:51 +08:00
jinzhao 89779e71c9 fix cross compile failed in arm32 2020-09-29 15:48:40 +08:00
Shengliang Guan 4d554b6762 Merge remote-tracking branch 'origin/develop' into feature/os 2020-09-29 14:28:21 +08:00
Shengliang Guan 61e27f7a98 TD-1530 2020-09-29 14:28:02 +08:00
Shengliang Guan 50af70aaab
Merge pull request #3721 from taosdata/feature/TD-1313 
[TD-1313]<hotfix>: update TSDBDatabaseMetadata
 2020-09-29 14:22:20 +08:00
zyyang-taosdata 7beef60c64 [TD-1313]<hotfix>: implement getColumns method in the TSDBDatabaseMetadata and update the next method in DatabaseMetaDataResultSet 2020-09-29 14:04:16 +08:00
Shengliang Guan fb0a143da1 Merge remote-tracking branch 'origin/develop' into feature/os 2020-09-29 11:58:39 +08:00
Shengliang Guan 14ba2ffb5b
Merge pull request #3719 from taosdata/feature/http 
Feature/http
 2020-09-29 11:39:19 +08:00
Shengliang Guan a2a5791b20 Merge remote-tracking branch 'origin/release/s102' into feature/http 2020-09-29 03:21:05 +00:00
Hongze Cheng 2f346de95e Fix TD-1635 2020-09-29 03:16:47 +00:00
Shengliang Guan 531ef740e8 TD-1530 2020-09-29 10:32:00 +08:00
Shengliang Guan b1ac114510 TD-1530 2020-09-29 10:26:50 +08:00
Shengliang Guan 3f573a46c8 Merge branch 'feature/os' of https://github.com/taosdata/TDengine into feature/os 2020-09-29 09:45:09 +08:00
Shengliang Guan c2446494ed TD-1530 2020-09-29 09:44:36 +08:00
Shengliang Guan 21792262f5 TD-1617 2020-09-29 01:23:14 +00:00
yihaoDeng 63feac06b4 TD-1659 2020-09-29 00:37:07 +00:00
tanxuefeng 655997e726 add hivemq-tdengine-extension 2020-09-29 01:14:22 +08:00
Shengliang Guan 283d144d1c TD-1530 2020-09-28 23:57:00 +08:00
Haojun Liao ec0290c94d [td-225] merge develop 2020-09-28 23:06:06 +08:00
Haojun Liao db66a5da57 [td-225] 2020-09-28 22:57:06 +08:00
Shengliang Guan 05687d1eba TD-1530 minor changes 2020-09-28 22:30:34 +08:00
Shengliang Guan fed24001bc TD1530 2020-09-28 18:36:10 +08:00
Shengliang Guan dec6288006 TD-1530 2020-09-28 07:59:35 +00:00
Shengliang Guan 3b724adeb3 TD-1530 2020-09-28 07:26:39 +00:00
Shengliang Guan e32e507e1f TD-1530 2020-09-28 14:29:23 +08:00
Shengliang Guan ca028a3d17 TD-1530 2020-09-28 04:20:40 +00:00
Shengliang Guan 6a1825905b minor changes 2020-09-28 03:22:31 +00:00
Shengliang Guan 077c8ff412 TD-1530 2020-09-28 02:55:59 +00:00
Shengliang Guan 2811c96b30 TD-1530 2020-09-28 10:29:49 +08:00
Haojun Liao 26e708bc0b [td-1300] 2020-09-28 10:17:53 +08:00
Shengliang Guan 2caeccf623 TD-1617 2020-09-27 15:34:44 +00:00
Shengliang Guan 6d04062576 TD-1617 2020-09-27 13:50:44 +00:00
Shengliang Guan 24c5f02cc9 TD-1617 2020-09-27 13:47:58 +00:00
Shengliang Guan 251fdf2c97 TD-1617 defect found by coverity scan 2020-09-27 11:12:38 +00:00
Haojun Liao c63ec824f3 [td-1603] add new error code at client side 2020-09-27 15:44:02 +08:00
Haojun Liao 100121251f [td-1619] 2020-09-27 15:11:46 +08:00
Haojun Liao 38c6df299f Merge remote-tracking branch 'origin/release/s102' into release/s102 2020-09-27 15:01:22 +08:00
Haojun Liao 9c7aecc3d0 [td-1619] 2020-09-27 15:00:35 +08:00
Shengliang Guan f82c9afcbc hotfix for invalid table id 2020-09-27 06:41:22 +00:00
Shengliang Guan 2f5ed602fe Merge remote-tracking branch 'origin/develop' into feature/ad 2020-09-27 06:04:54 +00:00
Shengliang Guan 456f65575a TD-1571 2020-09-27 05:55:25 +00:00
Hongze Cheng 1f94293644 fix coredump 2020-09-27 13:27:28 +08:00
Hongze Cheng 47ead85054 TD-1548 2020-09-27 10:47:52 +08:00
Hongze Cheng bbf3677729 TD-1548 2020-09-27 10:27:53 +08:00
zyyang 9dbc9b6fd8 [TD-1608]<hotfix>: fix bugs in jdbc parse url 2020-09-27 09:14:43 +08:00
Shengliang Guan 4736c6621d TD-1418 2020-09-25 16:26:16 +00:00
Shengliang Guan 4f3e8f404c Merge branch 'feature/ad' of https://github.com/taosdata/TDengine into feature/ad 2020-09-25 14:43:18 +00:00
Shengliang Guan f2dafd9c72 TD-1473 2020-09-25 14:42:56 +00:00
Shengliang Guan 7a840d7f2a change maxVgroupsPerDb to 16 2020-09-25 10:14:20 +00:00
Haojun Liao 284e159361 [td-1603] 2020-09-25 15:53:43 +08:00
Haojun Liao 9cb7efeec1 [td-1603] 2020-09-25 15:41:14 +08:00
Shengliang Guan 2cd68ffe69 TD-1574 compile in windows 2020-09-25 15:40:17 +08:00
Haojun Liao b2dd094ffa [td-1603] 2020-09-25 15:13:33 +08:00
Shengliang Guan 2f7cf2b02b Merge remote-tracking branch 'origin/develop' into feature/ad 2020-09-25 07:09:19 +00:00
Shengliang Guan 9431641ff1 minor changes 2020-09-25 07:05:49 +00:00
Haojun Liao 0dcef5b340 [td-1603] 2020-09-25 15:04:47 +08:00
Shengliang Guan 8f0e016fdc Merge remote-tracking branch 'origin/develop' into feature/http 2020-09-25 14:38:10 +08:00
Shengliang Guan d3d4691c94 TD-1550 2020-09-25 14:36:20 +08:00
Haojun Liao a5f68b0ff8 [td-1604]. 2020-09-25 14:22:49 +08:00
Haojun Liao 8195149c72 [td-225]. 2020-09-25 14:12:39 +08:00
Haojun Liao 901803abe6 [td-1604] 2020-09-25 14:11:38 +08:00
Shengliang Guan e9973578fd
Merge pull request #3668 from taosdata/bugfix/td-1488 
[td-1488]<fix>: 'Table does not exist' error when updating metadata between two clients
 2020-09-25 11:08:21 +08:00
Hui Li e74edd3d04 [TD-1504] 2020-09-25 10:34:49 +08:00
Shengliang Guan 7b0ba6bd7d Merge remote-tracking branch 'origin/develop' into feature/ad 2020-09-25 02:20:46 +00:00
Haojun Liao 2b909bc151 [td-1598] 2020-09-24 18:54:12 +08:00
Haojun Liao 535816bc5a [td-1596] 2020-09-24 17:45:57 +08:00
Bomin Zhang 4806e7bf3d fix td-1488 2020-09-24 16:30:14 +08:00
Haojun Liao 0eb138cd1d [td-1583] 2020-09-24 15:04:05 +08:00
Haojun Liao 4aaf2bd99c [td-225] refactor codes. 2020-09-24 13:52:30 +08:00
Haojun Liao 3a26dd3bfc [td-225]fix compiler error. 2020-09-24 11:14:35 +08:00
Haojun Liao 02d1583725 [td-1523] fix memory leaks and refactor some functions. 2020-09-24 11:09:16 +08:00
Haojun Liao 2779a01173 Merge branch 'develop' into feature/query 2020-09-24 10:55:11 +08:00
Bomin Zhang b2eddc7765 fix td-1558: fd(eventpoll) leaks 2020-09-24 09:28:29 +08:00
Shengliang Guan e54a96588b Merge remote-tracking branch 'origin/develop' into feature/ad 2020-09-23 15:02:00 +00:00
Shengliang Guan d627ab2a88 TD-1574 2020-09-23 15:01:18 +00:00
yihaoDeng 5337236c04 [TD-1595] 2020-09-23 13:19:57 +00:00
Haojun Liao 8ba206115a [td-1575] 2020-09-23 14:39:14 +08:00
Shengliang Guan 2fa10e63b6
Merge pull request #3643 from taosdata/bugfix/td-1469 
[TD-1469]<fix>: client hang when insert data with quoted column names (#3524)
 2020-09-23 13:32:59 +08:00
Shengliang Guan 99de55fa5f
Merge pull request #3644 from taosdata/feature/crash 
TD-1425
 2020-09-23 13:31:47 +08:00
Shengliang Guan 68871366b9
Merge pull request #3642 from taosdata/hotfix/TD-1533 
Hotfix/td 1533
 2020-09-23 13:31:24 +08:00
zyyang 5e7c1236e4 [TD-1533]<fix>: fix the jdbc url parse error 2020-09-23 11:15:25 +08:00
Bomin Zhang c346e0b0fc fix TD-1469 2020-09-23 11:09:41 +08:00
Shengliang Guan a9850f47d0 TD-1425 2020-09-23 10:55:44 +08:00
Shengliang Guan 96553e78ce Merge remote-tracking branch 'origin/develop' into feature/ad 2020-09-23 01:48:07 +00:00
Shengliang Guan bec674296e TD-1368 2020-09-22 18:01:11 +08:00
Shengliang Guan 95426ffdc5 Merge remote-tracking branch 'origin/develop' into feature/crash 2020-09-22 17:18:28 +08:00
Shengliang Guan 95430216ce
Merge pull request #3566 from taosdata/feature/td-1371 
Feature/td 1371
 2020-09-22 17:17:42 +08:00
Shengliang Guan 9ec42d055c
Merge pull request #3632 from taosdata/bugfix/td-1262 
[td-1262]<fix>: stream support history data (#3275)
 2020-09-22 17:16:56 +08:00
Shengliang Guan 3e57707227 TD-1388 2020-09-22 17:11:24 +08:00
Bomin Zhang 49d279e4f7 td-1262: stream support history data 2020-09-22 16:06:40 +08:00
Haojun Liao 4a3104f7fe [td-1371] update the sql.c 2020-09-22 15:51:15 +08:00
Hongze Cheng 153288bdfb Merge branch 'develop' into feature/update 2020-09-22 15:37:10 +08:00
Haojun Liao 40b6ce6761 [td-225] fix coverity problem 2020-09-22 15:33:08 +08:00
Shengliang Guan 079614647f Merge remote-tracking branch 'origin/develop' into feature/crash 2020-09-22 15:29:41 +08:00
Shengliang Guan f4605ba05e TD-1451 2020-09-22 15:28:35 +08:00
Shengliang Guan 8691e2d8c7
Merge pull request #3628 from taosdata/feature/query 
Feature/query
 2020-09-22 15:24:41 +08:00
Shengliang Guan 0d8f0fd901
Merge pull request #3627 from taosdata/hotfix/test 
Hotfix/test
 2020-09-22 15:23:04 +08:00
Hui Li 8f610e98d1 [TD-1465] 2020-09-22 14:54:25 +08:00
Hongze Cheng e118dc87a5 TD-1194 2020-09-22 14:48:36 +08:00
Haojun Liao eb0f6a1e45 [td-1544] 2020-09-22 14:22:45 +08:00
Haojun Liao 2d6315588c Merge remote-tracking branch 'origin/feature/query' into feature/query 2020-09-22 13:48:06 +08:00
Haojun Liao 67efcff7ad [td-225] fix bugs in regression test. 2020-09-22 13:47:18 +08:00
Hongze Cheng c126e6be3c Merge branch 'feature/update' of https://github.com/taosdata/TDengine into feature/update 2020-09-22 13:45:55 +08:00
Hongze Cheng 5ea611f2c8 TD-1194 2020-09-22 13:44:22 +08:00
yihaoDeng 02eb5c198c Merge branch 'feature/update' of https://github.com/taosdata/TDengine into updte 2020-09-22 05:33:10 +00:00
Hui Li 36d126c7ce update version.inc to 2.0.4.0 2020-09-22 12:51:37 +08:00
Shengliang Guan 6b3dcdda9c TD-1453 2020-09-22 11:42:50 +08:00
Shengliang Guan d123d8001f TD-1415 2020-09-22 11:19:45 +08:00
Hongze Cheng 724dbe862e Merge branch 'feature/update' of https://github.com/taosdata/TDengine into feature/update 2020-09-22 10:02:55 +08:00
Hongze Cheng 4a83966f5c TD-1194 2020-09-22 10:02:23 +08:00
Shengliang Guan 35dab9a437
Merge pull request #3619 from taosdata/hotfix/TD-1521 
fix bug TD-1521
 2020-09-22 09:27:58 +08:00
yihaoDeng cf9ba60ef2 support option to db 2020-09-21 17:17:31 +00:00
yihaoDeng ba968b813c fix bug TD-1521 2020-09-21 13:42:48 +00:00
Hui Li 04c20b25ad fix binary length 2020-09-21 18:28:36 +08:00
Bomin Zhang 3e89b203ae
Merge branch 'develop' into feature/query 2020-09-21 17:50:22 +08:00
Bomin Zhang c84ecd4c1b use cache in subscribe & prepare 2020-09-21 16:27:03 +08:00
Bomin Zhang 6e3d63727b use cache in subscribe & prepare 2020-09-21 16:24:12 +08:00
Haojun Liao d8a9ead27a [td-225] fix bugs in regression test. 2020-09-21 16:06:55 +08:00
Haojun Liao f91fccd82e [td-225] fix bugs in regression test. 2020-09-21 15:41:29 +08:00
Haojun Liao a8bd8db943 Merge branch 'develop' into feature/query 2020-09-21 15:24:00 +08:00
Haojun Liao 47d974994c [td-225] fix bugs in regression test. 2020-09-21 15:23:17 +08:00
Haojun Liao f982f2df5e [td-225] fix bugs in regression test. 2020-09-21 15:17:27 +08:00
Shengliang Guan 641265898a Merge branch 'feature/http' into release/s102 2020-09-21 14:14:54 +08:00
Shengliang Guan 68388b5634 Merge from release/s102 2020-09-21 05:21:34 +00:00
haojun Liao f0db62241c
Merge pull request #3598 from taosdata/feature/query 
[td-225] fix bugs in regression test.
 2020-09-21 13:21:22 +08:00
Haojun Liao ad1c82b6db [td-225] fix bugs in regression test. 2020-09-21 13:20:23 +08:00
haojun Liao c84c9d46c9
Merge pull request #3597 from taosdata/feature/query 
[td-225] fix bugs in regression test.
 2020-09-21 12:55:53 +08:00
Haojun Liao fbc4ebb915 [td-225] fix bugs in regression test. 2020-09-21 12:53:11 +08:00
Shengliang Guan 1a5272a49f TD-1520 2020-09-21 04:34:29 +00:00
Shengliang Guan e589dc241d
Merge pull request #3594 from taosdata/bugfix/stream 
[TD-1529]<fix>: CQ create db connection async
 2020-09-21 12:25:36 +08:00
Shengliang Guan 4209f666b8 [TD-1485] add update options 2020-09-21 12:20:33 +08:00
haojun Liao 76cef9f361
Merge pull request #3595 from taosdata/feature/query 
[td-225] fix bugs in regression test.
 2020-09-21 12:11:27 +08:00
Bomin Zhang d5f21eda17 TD-1529: stream async create db connection 
and also fix failed test cases related to stream.
 2020-09-21 12:05:29 +08:00
Shengliang Guan fad472bc9a
Merge pull request #3593 from taosdata/feature/query 
[td-225] fix bugs in regression test.
 2020-09-21 12:02:26 +08:00
Bomin Zhang 1f73c106b9 TD-1529: stream async create db connection 
and also fix failed test cases related to stream.
 2020-09-21 11:56:33 +08:00
Haojun Liao 77b86280fd [td-225] fix bugs in regression test. 2020-09-21 11:45:31 +08:00
Shengliang Guan 43d14affc6 Merge remote-tracking branch 'origin/develop' into feature/http 2020-09-20 09:19:41 +00:00
Shengliang Guan 347a45e24f minor changes 2020-09-18 10:53:58 +08:00
Hongze Cheng 384b5104fa set update 2020-09-18 10:51:12 +08:00
Haojun Liao 2d62f18294 Merge branch 'develop' into feature/query 2020-09-18 10:42:36 +08:00
Shengliang Guan 77048d5ad2 Merge from develop into feature/http 2020-09-18 10:18:58 +08:00
Shengliang Guan b76c6d6e7c TD-1520 2020-09-18 02:15:31 +00:00
Shengliang Guan 66894a8b05 Merge branch 'develop' of https://github.com/taosdata/TDengine into develop 2020-09-18 02:06:03 +00:00
Haojun Liao 079cd0e010 [td-225] fix a memory leak in query. 2020-09-17 21:46:28 +08:00
Bomin Zhang 28ac9104b0 td-1245: fix failed cast 'lastrow.sim' 2020-09-17 17:19:57 +08:00
Shengliang Guan 2f1264917b
Merge pull request #3556 from taosdata/feature/query 
Feature/query
 2020-09-17 17:10:03 +08:00
Shengliang Guan 1ddb252fc8 minor changes 2020-09-17 09:00:49 +00:00
Haojun Liao bd725f1b53 [td-225] fix compiler error on win 2020-09-17 16:48:06 +08:00
Haojun Liao 0655f427d3 [td-225] fix compiler error on win 2020-09-17 16:46:57 +08:00
Shengliang Guan 9976af09e3
Merge pull request #3568 from taosdata/feature/http 
[TD-1450]<fix>: change maxSqlLength from 8M to 1M
 2020-09-17 16:41:00 +08:00
Haojun Liao e7fa1ad0b3 [td-1478] 2020-09-17 16:34:43 +08:00
Haojun Liao 4f83e11354 [td-1483] 2020-09-17 16:33:40 +08:00
Shengliang Guan ce7a3623fb TD-1450 change maxSqlLength from 8M to 1M 2020-09-17 08:14:08 +00:00
Shengliang Guan 5c369d2c9f
Merge pull request #3565 from taosdata/feature/http 
memory leak in restful while close context
 2020-09-17 15:49:46 +08:00
Shengliang Guan 6f908d0397 compile error in windows 2020-09-17 15:49:20 +08:00
Shengliang Guan a93e2c804e Merge remote-tracking branch 'origin/develop' into feature/td-1371 2020-09-17 15:46:05 +08:00
Shengliang Guan c9e1f79317 git commit -m 'memory leak in restful while close context' 2020-09-17 07:07:27 +00:00
Hongze Cheng 29318b10f4 Merge branch 'develop' into feature/update 2020-09-17 14:09:48 +08:00
zyyang 804045682c solve conflict 2020-09-17 14:06:39 +08:00
zyyang 21a03f05fc merge develop's code 2020-09-17 13:52:20 +08:00
zyyang e406aedbb4 clean unused codes 2020-09-17 13:32:12 +08:00
Shengliang Guan 1741508f4f Meger from develop into feature/query 2020-09-17 12:57:07 +08:00
Shengliang Guan 2d6f6afc17 compile in windows 2020-09-17 12:14:34 +08:00
Hongze Cheng 2b1dc53ae1 fix update bug 2020-09-17 12:13:19 +08:00
Shengliang Guan 0eaffe9032 Merge remote-tracking branch 'origin/develop' into feature/td-1245 2020-09-17 12:11:07 +08:00
Shengliang Guan 3d550c1a3c
Merge pull request #3559 from taosdata/develop 
Merge from develop into feature/td-1245
 2020-09-17 11:46:47 +08:00
Shengliang Guan f44eea86f7
Merge pull request #3558 from taosdata/develop 
Merge from develop into feature/query
 2020-09-17 11:44:48 +08:00
Shengliang Guan cff2e7c48b Merge remote-tracking branch 'origin/develop' into hotfix/sangshuduo/fix-compile-error-for-release 2020-09-17 03:42:15 +00:00
Shuduo Sang 1a7786f396 merged develop branch and fixed conflict. 2020-09-17 11:19:12 +08:00
Hongze Cheng 3d2a77ea6d fix skiplist crash bug 2020-09-17 11:13:06 +08:00
Shengliang Guan 46516d98a3 compile in windows 2020-09-17 10:52:50 +08:00
Haojun Liao c4d7810b76 [td-1478] 2020-09-17 10:07:32 +08:00
Haojun Liao a96f993692 [td-1442] 2020-09-17 10:06:12 +08:00
Bomin Zhang 1f63c23f2b td-1245: fix compile error 2020-09-17 09:46:48 +08:00
Bomin Zhang 7cdb6c3f24 td-1245: disable natual duration in 'insert'&'where' 2020-09-17 09:44:02 +08:00
Bomin Zhang 6fa86bfb8f td-1245: fix crash and refactor 2020-09-17 09:44:02 +08:00
Bomin Zhang 85aca0c276 td-1245: replace taosAddNatualInterval with taosTimeAdd 2020-09-17 09:44:02 +08:00
Bomin Zhang 76d407395f td-1245: refactor interval/sliding/offset to one struct 2020-09-17 09:44:02 +08:00
Bomin Zhang 4456951e66 td-1245: update sql grammar to support offset 2020-09-17 09:43:26 +08:00
Haojun Liao 010c30afbf [td-1477] 2020-09-17 09:39:37 +08:00
Shengliang Guan 1487bc5870
Merge pull request #3549 from taosdata/feature/query 
[td-1478]
 2020-09-16 19:08:42 +08:00
Haojun Liao 6ea7e4ee84 [td-1478] 2020-09-16 18:36:58 +08:00
Hongze Cheng aca8e3644b TD-1439 2020-09-16 17:26:08 +08:00
Shengliang Guan e1b8d3910e
Merge pull request #3538 from taosdata/feature/query 
Feature/query
 2020-09-16 17:01:08 +08:00
Hongze Cheng 5023ce7d36 TD-1438 2020-09-16 15:58:48 +08:00
Haojun Liao d7f409fd9a [td-225] fix compiler error in win platform 2020-09-16 15:09:43 +08:00
Haojun Liao 848a37aafe [td-225] fix compiler error in win platform 2020-09-16 15:05:57 +08:00
Haojun Liao d545eb9bb4 [td-225] fix compiler error in win platform 2020-09-16 15:01:10 +08:00
Shengliang Guan 06a22eefe7
Merge pull request #3539 from taosdata/hotfix/test 
[TD-1468]
 2020-09-16 13:11:26 +08:00
Haojun Liao b002f0be51 [td-225] 2020-09-16 12:54:00 +08:00
Haojun Liao 5e6006f533 [td-225] fix compiler errors. 2020-09-16 11:28:17 +08:00
Hongze Cheng 09e91f9ad4 TD-1437 2020-09-16 11:22:49 +08:00
Shuduo Sang e7099d5518 add void cast to solve unused variables. 2020-09-16 11:02:36 +08:00
Hui Li ce458cf037 [TD-1468] 2020-09-16 11:00:48 +08:00
Shuduo Sang af08259379 Merge branch 'develop' into hotfix/sangshuduo/fix-compile-error-for-release 2020-09-16 11:00:22 +08:00
Haojun Liao 805ee80611 [td-225] merge develop 2020-09-16 09:36:41 +08:00
Shengliang Guan 8381148d80 TD-1364 2020-09-16 00:55:38 +00:00
Shengliang Guan 5b208fd479 TD-1291 2020-09-15 16:16:02 +00:00
Haojun Liao 4454b077ff [td-1456] 2020-09-15 23:49:17 +08:00
Shengliang Guan 0015100d2b TD-1364 2020-09-15 15:40:10 +00:00
Shuduo Sang e544363106 [TD-1459] <fix>: fix compile error for release build type. 2020-09-15 18:56:32 +08:00
Shengliang Guan 966b618b92
Merge pull request #3532 from taosdata/feature/http 
Feature/http
 2020-09-15 18:01:15 +08:00
Shengliang Guan 2372e4decc TD-1451 2020-09-15 17:26:48 +08:00
Shengliang Guan 41a21ca29e TD-1225 2020-09-15 16:23:37 +08:00
Haojun Liao 4d6e0ef40e [td-1454] 2020-09-15 16:09:48 +08:00
Shengliang Guan 5e2b3f9108
Merge pull request #3529 from taosdata/hotfix/groupby 
[td-1290]
 2020-09-15 16:03:10 +08:00
Haojun Liao bffd30ef80 [td-1290] 2020-09-15 15:21:22 +08:00
Haojun Liao 11cc33c575 [td-1446] 2020-09-15 14:02:33 +08:00
zyyang-taosdata 8a39f899b6 add calcite test case 2020-09-15 00:04:15 +08:00
Haojun Liao 9d1619c3b9 [td-1391] refactor 2020-09-14 23:37:45 +08:00
Shengliang Guan 125e7e9340 TD-1291 2020-09-14 22:23:50 +08:00
Haojun Liao 5ff1dbe5f3 [td-1391]add free subobj 2020-09-14 21:41:42 +08:00
Shengliang Guan 6e46c77f6c TD-1326 2020-09-14 11:36:17 +00:00
root f878512588 [TD-1291] 2020-09-14 18:34:22 +08:00
Haojun Liao 62d6f6c9a3 [td-1391] update test 2020-09-14 18:02:16 +08:00
Haojun Liao 5a641b058c [td-1391] update test 2020-09-14 18:01:41 +08:00
Haojun Liao 89c417d6fa [td-1391] 2020-09-14 17:51:41 +08:00
zyyang 99741286ce adapt the calcite for customer GLD 2020-09-14 17:48:27 +08:00
Haojun Liao eaa6ca2701 [td-1391] upate the check of vgroup info. 2020-09-14 17:44:29 +08:00
root dfa681df3c [TD-1291] 2020-09-14 17:24:08 +08:00
Haojun Liao 4bed0a0f39 [td-1391] update the error msg output info. 2020-09-14 17:16:23 +08:00
Haojun Liao 0c43959191 [td-1391] fix bugs in release obj in submit processing. 2020-09-14 16:55:08 +08:00
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
yihaoDeng 1a316eb7f4 [TD-1371]<featuren> implement query 'show create table' 2020-09-14 04:33:15 +00:00
yihaoDeng ed1267a0d7 update sql.c 2020-09-13 23:12:29 +00:00
yihaoDeng 670c6c7d87 fix bug 2020-09-13 21:59:59 +00:00
yihaoDeng 48ac122e4a fix bug 2020-09-13 21:42:47 +00:00
yihaoDeng 5ed10d3a4c suppport cmd show-create-table and show-create-db 2020-09-13 21:18:55 +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
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