Commit Graph

821 Commits

Author SHA1 Message Date
Haojun Liao 8259824430 [TD-225]fix compiler error. 2020-11-04 16:08:49 +08:00
Haojun Liao 41d5ee51fa Merge branch 'develop' into feature/query 2020-11-04 16:05:43 +08:00
Haojun Liao 5980b836c9 [TD-225] 2020-11-04 14:11:24 +08:00
Hongze Cheng d0bef0312c Merge branch 'develop' into feature/update 2020-11-04 05:39:00 +00:00
Shengliang Guan 977589dee0 compile err in windows 2020-11-03 20:34:35 +08:00
Haojun Liao 0b83e6746e [TD-1876]<fix>: fix bugs in arithmetic expression in super table join query processing. 2020-11-03 18:02:31 +08:00
Haojun Liao 5be04aa8d4 [TD-225]refactors. 2020-11-03 11:02:11 +08:00
Haojun Liao a9f0a30dc5 [TD-1870]<enhance>: optimize the memory consumption. 2020-11-02 23:44:15 +08:00
Haojun Liao 2cd975745c [TD-225] refactor codes. 2020-11-02 15:23:43 +08:00
Haojun Liao 95104645c5 [TD-225]<enhance>: optimize the memory consumption for interval query. 2020-11-02 14:40:36 +08:00
Haojun Liao 5bbd7dd9d6 [TD-1870] 2020-11-02 14:10:15 +08:00
Haojun Liao 2314b1952b [TD-1870] reduce memory consumption during query processing. 2020-11-01 23:08:28 +08:00
Haojun Liao a8e86c9a67 [TD-1870] 2020-10-31 23:14:43 +08:00
Haojun Liao b8bead9a92 [TD-225] add logs. 2020-10-31 16:33:05 +08:00
Haojun Liao d371c840f0 [TD-225] add logs. 2020-10-31 13:18:45 +08:00
Haojun Liao a0ccfd3145 [TD-225] add logs. 2020-10-31 11:43:52 +08:00
Haojun Liao 17e35e7aee [TD-225] add logs; 2020-10-31 11:14:25 +08:00
Haojun Liao b9f35001ca [TD-225] fix memory leaks. 2020-10-31 11:13:31 +08:00
Haojun Liao 80b2acff4b [TD-225] fix memory leaks. 2020-10-30 22:43:34 +08:00
Haojun Liao 93c666bbb9 [TD-225] refactor codes. 2020-10-30 16:12:17 +08:00
Hongze Cheng e486872896 initialize database update option 2020-10-30 10:43:40 +08:00
Hongze Cheng 915677cd6e Merge branch 'develop' into feature/update 2020-10-30 10:05:37 +08:00
Haojun Liao 713d5d56fb [td-255] merge develop 2020-10-29 15:51:43 +08:00
Haojun Liao 6f3023fba9 [td-1826] 2020-10-29 12:01:57 +08:00
Haojun Liao f126b8d572 [td-1826] 2020-10-29 11:21:17 +08:00
Hongze Cheng dfc7c836fa Merge branch 'develop' into feature/update 2020-10-29 09:49:49 +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
Haojun Liao b736211317 [td-1829] 2020-10-27 23:04:51 +08:00
Haojun Liao 67c3831601 [td-225] refactor. 2020-10-27 17:34:28 +08:00
Haojun Liao 092da36952 [td-225] fix bugs by regression test. 2020-10-27 10:22:12 +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 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 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 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
Bomin Zhang f49b447519 fix TD-1776 2020-10-23 16:29:32 +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 18f646b798 [td-1373] 2020-10-22 17:49:49 +08:00
Haojun Liao e06d7083c1 [td-1373] 2020-10-22 16:45:17 +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
yihaoDeng 44b6dd9a3f TD-1720 2020-10-21 22:57:49 +00: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
Haojun Liao a170da7201 [td-1664] 2020-10-21 13:49:31 +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 e910cae1ec [td-1756] 2020-10-20 14:06:03 +08:00
Haojun Liao 7c4276cb05 [td-1752] 2020-10-20 13:44:05 +08:00
Haojun Liao 959c3405a0 [td-1756] add error check 2020-10-20 11:41:35 +08:00
Haojun Liao 40c7208cc2 [td-225] 2020-10-19 09:53:20 +08:00
Haojun Liao b3165d4193 [td-225] 2020-10-18 15:38:18 +08:00
yihaoDeng 91782c5b99 TD-1733 2020-10-18 01:04:17 +00:00
Haojun Liao 5adcf14d6e [td-225] 2020-10-18 00:45:49 +08:00
Haojun Liao 95adf3ea61 [td-225] 2020-10-17 23:47:40 +08:00
Haojun Liao 513eb4d7eb [td-225] 2020-10-17 13:03:59 +08:00
Haojun Liao 59abdffcd7 [td-1720] 2020-10-16 23:01:02 +08:00
yihaoDeng f25158733f TD-1665 2020-10-11 04:38:43 +00:00
Shengliang Guan 60688a0365
Merge pull request #3743 from taosdata/develop
Merge from develop
2020-10-02 08:50:28 +08:00
Shengliang Guan c2446494ed TD-1530 2020-09-29 09:44:36 +08:00
Haojun Liao ec0290c94d [td-225] merge develop 2020-09-28 23:06:06 +08:00
Shengliang Guan 2811c96b30 TD-1530 2020-09-28 10:29:49 +08:00
Haojun Liao 535816bc5a [td-1596] 2020-09-24 17:45:57 +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
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
Hongze Cheng e118dc87a5 TD-1194 2020-09-22 14:48:36 +08:00
yihaoDeng cf9ba60ef2 support option to db 2020-09-21 17:17:31 +00:00
Haojun Liao 77b86280fd [td-225] fix bugs in regression test. 2020-09-21 11:45:31 +08:00
Bomin Zhang 28ac9104b0 td-1245: fix failed cast 'lastrow.sim' 2020-09-17 17:19:57 +08: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
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
Hongze Cheng 29318b10f4 Merge branch 'develop' into feature/update 2020-09-17 14:09:48 +08:00
Shengliang Guan 1741508f4f Meger from develop into feature/query 2020-09-17 12:57:07 +08:00
Shengliang Guan 0eaffe9032 Merge remote-tracking branch 'origin/develop' into feature/td-1245 2020-09-17 12:11:07 +08:00
Shuduo Sang 1a7786f396 merged develop branch and fixed conflict. 2020-09-17 11:19:12 +08:00
Haojun Liao c4d7810b76 [td-1478] 2020-09-17 10:07:32 +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
Haojun Liao 6ea7e4ee84 [td-1478] 2020-09-16 18:36:58 +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
Hongze Cheng 09e91f9ad4 TD-1437 2020-09-16 11:22:49 +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
Shuduo Sang e544363106 [TD-1459] <fix>: fix compile error for release build type. 2020-09-15 18:56:32 +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 7d56810a6e [td-225] update test 2020-09-14 14:37:58 +08: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 5ed10d3a4c suppport cmd show-create-table and show-create-db 2020-09-13 21:18:55 +00:00
Haojun Liao a28d714d98 td-1423] fix bugs in group by nchar/binary columns. #3476 2020-09-11 18:35:10 +08:00
Haojun Liao b9566424ba [td-1412] 2020-09-11 10:22:42 +08:00
Haojun Liao dd368d91af [td-1412] 2020-09-10 22:12:17 +08:00
Haojun Liao d74478425b [td-1411] 2020-09-10 17:16:28 +08:00
Haojun Liao 8271462385 [td-1369] 2020-09-10 13:05:59 +08:00
Haojun Liao 9768c30be1 [td-1372] 2020-09-09 22:15:12 +08:00
Haojun Liao 5b6ca20f0b [td-225] refactor codes. 2020-09-09 18:15:59 +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
root 07b38c1cac Merge remote-tracking branch 'origin/develop' into feature/mqtt 2020-09-07 11:24:24 +08:00
Haojun Liao 3a54e379ad [td-1333] 2020-09-05 14:52:15 +08:00
root a4da89b3ae Merge remote-tracking branch 'origin/develop' into feature/mqtt 2020-09-04 00:01:58 +08:00
Haojun Liao 29a8c27dcb [td-1308] 2020-09-03 18:37:47 +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 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 ad04bca69f
Merge pull request #3360 from taosdata/feature/query
Feature/query
2020-09-03 11:04:35 +08:00
Haojun Liao 8137a287b9 [td-225] fix last query bug and add some function definitions. 2020-09-03 10:28:02 +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
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
Haojun Liao 88ba66dd8b [td-1290] 2020-09-02 10:08:35 +08:00
Haojun Liao fb1178c452 [td-1302] 2020-09-01 17:35:37 +08:00
Shengliang Guan 9ff439408b compile in windows 2020-09-01 13:25:53 +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
Bomin Zhang e967332096 td-1099: natual interval in stream and bug fix 2020-08-31 17:12:50 +08:00
Haojun Liao f3c92ad39b [td-1206] 2020-08-31 16:40:41 +08:00
Bomin Zhang 1afed4c067 td-1099: fix bug & compile error / add test cases 2020-08-29 17:18:14 +08:00
Bomin Zhang b3840db93e td-1099: natual month/year processing 2020-08-29 15:47:39 +08:00
yihaoDeng 0bb8ca7d1b TD-1230 2020-08-28 18:35:12 +00:00
Shengliang Guan ae8fbb6b21 TD-1090 compile error in windows 2020-08-28 11:57:40 +08:00
Haojun Liao 76ad0bc70e [td-255] add check for memory allocation failure. 2020-08-27 18:32:34 +08:00
Haojun Liao 18637381a4 [td-1151] 2020-08-26 11:03:42 +08:00
Haojun Liao dac0a985c2 [td-1213] 2020-08-24 22:50:16 +08:00
Haojun Liao 5b5edf0026 [td-1010] add check for max interval time range. 2020-08-24 16:13:31 +08:00
Haojun Liao ba9ef1377d [td-1151] add test cases and fix the found bugs. 2020-08-24 15:36:06 +08:00
Haojun Liao e4e4c7fcd3 [td-1067] 2020-08-22 23:02:12 +08:00
Haojun Liao 51290fd1aa [td-1067] 2020-08-22 19:02:58 +08:00
Haojun Liao 0fc1c8cdb5 [td-837] check mem after malloc 2020-08-22 17:50:12 +08:00
Haojun Liao 6c5ff84d2c [td-225] merge develop 2020-08-21 17:16:04 +08:00
Haojun Liao 3050af21b2 [td-225] add some logs. 2020-08-21 14:16:42 +08:00
Haojun Liao c5cfeee493 [td-1067] fix bugs in lastrow query. 2020-08-20 23:40:39 +08:00
Haojun Liao 49f23d689d [td-1067] opt last_row queries 2020-08-20 18:08:31 +08:00
Shengliang Guan e53ebe94df TD-1090 compile client in windows 32 platform 2020-08-20 16:27:44 +08:00
Haojun Liao 61622a73b1 [td-225] fix jdbc memory leaks. 2020-08-20 14:20:31 +08:00
Haojun Liao 23876ceb76 [td-1103] merge develop 2020-08-19 10:33:34 +08:00
Haojun Liao 9031c50ca4 [td-1103] fix bugs 2020-08-19 01:22:36 +08:00
Haojun Liao 2238b29ffe [td-1103] fix a typo 2020-08-18 15:51:52 +08:00
Haojun Liao 8972ebc101 [td-1103] refactor the structure for reducing memory consumption during interval query. 2020-08-18 15:50:52 +08:00
yihaoDeng 4de2164b5f TD-1167 fix coverity problem 2020-08-18 06:10:21 +00:00
Haojun Liao 58bad4cf38 [td-1151] fix the coverity warnings 2020-08-18 13:18:49 +08:00
Haojun Liao 39618becb7 [td-1151] 2020-08-18 00:01:01 +08:00
Haojun Liao ff20d564ab [td-1109] 2020-08-15 23:05:07 +08:00
Haojun Liao 8be56fb73c [td-1148] enable the binary tag to be used as the join condition. 2020-08-15 11:35:04 +08:00
Haojun Liao d7579e02a1 [td-225] fix the bugs in fill for interval query 2020-08-14 15:08:15 +08:00
Haojun Liao 7c4f8f6464 [td-225] fix bug while multiple tags exists during fill results 2020-08-14 11:04:26 +08:00
Haojun Liao 26b4478db8 Merge branch 'develop' into feature/query 2020-08-13 15:42:28 +08:00
Haojun Liao d1382a7a04 [td-225] refactoring codes. 2020-08-13 15:07:04 +08:00
Haojun Liao 2405590978 [td-225] minor refactoring. 2020-08-13 12:01:25 +08:00
Haojun Liao 7bcd7447eb [td-225] return error code in tsdb to client during the data retrieval. 2020-08-13 11:37:42 +08:00
Shengliang Guan 4d9c3488ce
Merge pull request #3045 from taosdata/feature/query
[td-225] fix bugs.
2020-08-13 01:02:13 +08:00
Haojun Liao 259928d4de [td-225] fix bugs. 2020-08-13 00:59:49 +08:00
Shengliang Guan 19181af91c
Merge pull request #3044 from taosdata/feature/query
Feature/query
2020-08-13 00:37:44 +08:00
Haojun Liao 86032d83e5 [td-225] restrict the number of tags assignment. 2020-08-13 00:35:10 +08:00
Shengliang Guan 0ac540218a TD-1057 minor changes 2020-08-10 23:57:14 +08:00
Shengliang Guan 2dfcac405a TD-1057 change pthread_t to int64 2020-08-10 23:51:53 +08:00
Shengliang Guan d4f3954891 TD-1057 change compile errors 2020-08-10 23:22:01 +08:00
Shengliang Guan d776f10dae TD-1057 2020-08-10 14:02:14 +00:00
Shengliang Guan 4bd41a0fbf TD-1057 2020-08-10 18:17:14 +08:00
Haojun Liao 40318cc50e [td-255] merge develop 2020-08-10 17:58:09 +08:00
Shengliang Guan 03a29a618f
Merge branch 'develop' into master 2020-08-10 17:42:06 +08:00
Haojun Liao e00d072887 [td-1101] add time range check, fix bugs for projection query. 2020-08-10 17:38:09 +08:00
Shengliang Guan 41d97eeea7 TD-1057 2020-08-09 15:21:03 +00:00
yihaoDeng c9ac6b03e0 set tag conditions limit 2020-08-09 14:23:08 +00:00
Shengliang Guan 95f764060c Merge remote-tracking branch 'origin/bugfix/td-1089' into feature/os 2020-08-08 21:04:14 +08:00
Shengliang Guan 0546c7ab85 Merge remote-tracking branch 'origin/develop' into feature/os 2020-08-08 21:03:57 +08:00
Haojun Liao 16ac4b66c9 [td-225] fix memory leak 2020-08-08 18:07:51 +08:00
Haojun Liao c1b3156563 [td-225] fix memory leak 2020-08-08 17:48:08 +08:00