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

6669 Commits

Author SHA1 Message Date
Shengliang Guan ea3aae750e
Merge pull request #4298 from taosdata/feature/wal 
Feature/wal
 2020-11-20 14:09:32 +08:00
Haojun Liao 5f6ea86895 [TD-2152] 2020-11-20 14:04:05 +08:00
Haojun Liao dec06d7c23 [TD-2152]<fix>: fix the bug that failed to check the invalid column during join query in order by clause. 2020-11-20 13:56:33 +08:00
Shengliang Guan f323186f78 TD-2046 2020-11-20 13:48:05 +08:00
Shengliang Guan 566b749cc5 TD-2046 2020-11-20 12:32:42 +08:00
Haojun Liao b2cbf6eb4a Merge remote-tracking branch 'origin/feature/query' into feature/query 2020-11-20 12:00:06 +08:00
Haojun Liao 5c06bd53a6 [TD-225] 2020-11-20 11:58:26 +08:00
haojun Liao 95f67a0030
Merge branch 'develop' into feature/query 2020-11-20 11:00:44 +08:00
Haojun Liao c0ea91ef53 [TD-2090] 2020-11-20 10:59:15 +08:00
Jeff Tao a8b87ce0cd change applications 2020-11-20 01:07:33 +00:00
Haojun Liao d7e8b4c184 [TD-225] refactor codes. 2020-11-19 23:08:25 +08:00
Haojun Liao 3afd7a65a7 [TD-2145]<fix>: fix bugs in interval query. 2020-11-19 22:34:07 +08:00
Haojun Liao d4cd364f9e [TD-1765]<fix>: fix bugs in percentile query during group by normal columns. 2020-11-19 18:37:11 +08:00
Shengliang Guan 976d8653bb TD-2153 2020-11-19 09:57:57 +00:00
Shengliang Guan b09445a35b Merge remote-tracking branch 'origin/release/s106' into feature/wal 2020-11-19 09:57:34 +00:00
haojun Liao c4c9c39dc4
Merge pull request #4294 from taosdata/feature/query 
Feature/query
 2020-11-19 17:54:56 +08:00
Shengliang Guan 5029e7da3f TD-2153 2020-11-19 09:53:34 +00:00
Haojun Liao bc41fa4ae8 [TD-225] 2020-11-19 17:49:05 +08:00
Shengliang Guan a82d594a81 TD-2157 2020-11-19 09:48:48 +00:00
Haojun Liao 4a7fc101a0 [TD-2159] 2020-11-19 17:18:18 +08:00
Haojun Liao ec8c6d0c16 [TD-2159]<fix>: fix bugs in limit/offset in group by normal columns. 2020-11-19 16:54:26 +08:00
Shengliang Guan 2171bf7a15 TD-2157 2020-11-19 08:39:16 +00:00
Haojun Liao 2ae05f8daa [TD-2144] 2020-11-19 16:24:11 +08:00
Hui Li 727ed76d00 [temp not compile odbc] 2020-11-19 15:49:39 +08:00
plum-lihui cd6bb16a0b change packaging scripts 2020-11-19 15:44:29 +08:00
plum-lihui da5b584eab Merge branch 'release/s106' of https://github.com/taosdata/TDengine into release/s106 2020-11-19 15:32:22 +08:00
plum-lihui c3199e6f79 [TD-2156]<hotfix>: change packaging tool 2020-11-19 15:31:40 +08:00
haojun Liao 143e60111e
Merge pull request #4290 from taosdata/feature/query 
Feature/query
 2020-11-19 15:15:43 +08:00
Haojun Liao 1e1e947310 [TD-225] 2020-11-19 15:12:18 +08:00
huili 3f7067a1a6
Merge pull request #4289 from taosdata/hotfix/TD-2156 
[TD-2156]<hotfix>: change packaging scripts for aarch32
 2020-11-19 15:07:29 +08:00
huili b4e8f00a4c
Merge pull request #3981 from freemine/odbc 
odbc connector, keep going
 2020-11-19 14:49:22 +08:00
huili 967da6f1c3
Merge pull request #4286 from taosdata/hotfix/sangshuduo/fix-odbc-compile-error-for-centos7 
[TD-2155] <fix>: fix compile error for centos 7.
 2020-11-19 14:45:11 +08:00
zyyang-taosdata 182328eba9 [TD-2156]<hotfix>: change packaging scripts for aarch32 2020-11-19 06:43:56 +00:00
haojun Liao a08429e958
Merge pull request #4288 from taosdata/feature/query 
Feature/query
 2020-11-19 14:19:50 +08:00
Haojun Liao af8f4bb236 [TD-225] 2020-11-19 13:53:56 +08:00
Haojun Liao a29327ef42 [TD-225] 2020-11-19 13:44:47 +08:00
Haojun Liao fa3205dcee [TD-225] 2020-11-19 13:32:08 +08:00
Haojun Liao 3cbbc55e46 [TD-225] 2020-11-19 13:26:37 +08:00
Shengliang Guan b95df0b84a TD-2153 2020-11-19 05:09:50 +00:00
haojun Liao 36bf5b1235
Merge pull request #4282 from taosdata/hotfix/TD-2148 
[TD-2148]<fix>: SQL exceeding limits return unclear msg
 2020-11-19 13:06:47 +08:00
haojun Liao a0e9491a30
Merge pull request #4284 from taosdata/feature/query 
Feature/query
 2020-11-19 11:34:29 +08:00
huili 4e15e67eaa
Merge pull request #4285 from taosdata/test/TD-1590 
Test/td 1590
 2020-11-19 11:28:47 +08:00
Shuduo Sang 39406da3bc [TD-2155] <fix>: fix compile error for centos 7. 2020-11-19 11:05:23 +08:00
Haojun Liao d0afbae3cc [TD-225] 2020-11-19 11:03:37 +08:00
Haojun Liao 0b1abeb5d6 [TD-225] 2020-11-19 11:00:48 +08:00
Haojun Liao 1faef8863d [TD-225] 2020-11-19 10:56:15 +08:00
Haojun Liao a41312d524 [TD-225] 2020-11-19 10:51:39 +08:00
zyyang ad5474d8aa change 2020-11-19 10:49:01 +08:00
Haojun Liao 4410234af2 [TD-225] 2020-11-19 10:44:03 +08:00
Haojun Liao 78492a88b9 Merge branch 'develop' into feature/query 2020-11-19 10:33:39 +08:00
haojun Liao 5ea20ca49a
Merge pull request #4283 from taosdata/hotfix/regressionbug 
[TD-225]
 2020-11-19 10:21:56 +08:00
liuyq-617 49c19cbd1f Merge branch 'feature/query' of github.com:taosdata/TDengine into feature/query 2020-11-19 10:20:41 +08:00
liuyq-617 4c8a92c9ef fix python connector err 2020-11-19 10:20:34 +08:00
Haojun Liao 99c985983b [TD-225] fix regression test bugs. 2020-11-19 10:13:54 +08:00
Haojun Liao c17b4dcc98 Merge remote-tracking branch 'origin/feature/query' into feature/query 2020-11-19 10:02:14 +08:00
Haojun Liao 312f26fda6 [TD-1355] 2020-11-19 10:01:58 +08:00
liuyq-617 9c41f5cdbf Merge branch 'feature/query' of github.com:taosdata/TDengine into feature/query 2020-11-19 09:52:39 +08:00
liuyq-617 521bda2f55 <fix>fix python connector err 2020-11-19 09:52:09 +08:00
zyyang 38459ed354 change 2020-11-19 09:46:30 +08:00
Haojun Liao 15d1a1ba9a [TD-225] refactor 2020-11-19 00:00:56 +08:00
Haojun Liao 835e9da1f8 [TD-225] refactor jdbc driver 2020-11-18 23:58:12 +08:00
Haojun Liao 4dff524a5b [TD-225] refactor jdbc driver 2020-11-18 23:49:44 +08:00
Shengliang Guan 89faa7299f Merge remote-tracking branch 'origin/develop' into feature/wal 2020-11-18 22:32:14 +08:00
Shengliang Guan 08b49fc725 Merge branch 'feature/wal' of https://github.com/taosdata/TDengine into feature/wal 2020-11-18 22:23:56 +08:00
Haojun Liao 59c32df42e [TD-225] merge develop 2020-11-18 21:46:05 +08:00
Haojun Liao 7b7fc4df86 [TD-225] 2020-11-18 21:41:15 +08:00
haojun Liao a960a32f4d
Merge pull request #4280 from taosdata/hotfix/regressionbug 
[TD-225]fix regression bugs.
 2020-11-18 20:01:19 +08:00
Haojun Liao 36297455b7 [TD-225] 2020-11-18 19:41:49 +08:00
Shengliang Guan 7376933e4c
Merge pull request #4281 from taosdata/feature/wal 
Feature/wal
 2020-11-18 19:37:06 +08:00
Haojun Liao c8b2369a81 [TD-225] 2020-11-18 19:35:38 +08:00
yihaoDeng fec8a784e9 [TD-2148]<fix>: SQL exceeding limits return unclear msg 2020-11-18 11:20:02 +00:00
Shengliang Guan 3acab9b55e TD-2147 2020-11-18 11:05:39 +00:00
Haojun Liao 65e904b7a7 [TD-225] fix memory leaks. 2020-11-18 18:58:50 +08:00
Haojun Liao 07bd21e6c6 [TD-2070] 2020-11-18 18:33:22 +08:00
Haojun Liao 0c5048fa86 [TD-225]fix regression bugs. 2020-11-18 18:21:19 +08:00
zyyang 7be93e1908 change 2020-11-18 18:16:48 +08:00
zyyang 88232e2e35 change 2020-11-18 18:05:50 +08:00
zyyang 75d4d18c74 [TD-1590]<test>: a test case for JDBC failover 2020-11-18 18:04:26 +08:00
Shengliang Guan cf5bcc4b58 TD-2046 2020-11-18 17:55:57 +08:00
zyyang 4c11e46075 change 2020-11-18 17:40:00 +08:00
Shengliang Guan c1e1dd6427 TD-2045 2020-11-18 17:05:06 +08:00
huili 0f0412cf60
Merge pull request #4279 from taosdata/feature/TD-1859 
[TD-1859]<feature>: a JDBC implementation use TDengine Restful Interface
 2020-11-18 16:54:38 +08:00
Haojun Liao 87ab74823d [TD-2070]<enhance>: optimize the load data performance. 2020-11-18 16:37:04 +08:00
zyyang e74d20eca2 change name 2020-11-18 16:08:16 +08:00
Shengliang Guan 98ec34b40d TD-2046 2020-11-18 16:06:06 +08:00
zyyang af51dce426 [TD-1859]<feature>: a JDBC implementation use TDengine Restful Interface 2020-11-18 15:47:17 +08:00
Shengliang Guan 97e41cdf8d TD-2046 2020-11-18 15:39:57 +08:00
Shengliang Guan f38b218247 TD-2046 2020-11-18 14:45:00 +08:00
Shengliang Guan c9b193d808
Merge pull request #4277 from taosdata/feature/wal 
[TD-2083]<fix>: synchronization may fail when creating a table
 2020-11-18 14:34:10 +08:00
Shengliang Guan 9d6e377623 TD-1898 2020-11-18 14:25:16 +08:00
Shengliang Guan 858c034cdc TD-2083 2020-11-18 06:05:06 +00:00
haojun Liao 6f850e1a74
Merge pull request #4268 from taosdata/bugfix/td-2106 
[TD-2106]<fix>: cannot find table by alias
 2020-11-18 14:03:51 +08:00
Shengliang Guan 0edf4333f3 TD-2083 2020-11-18 06:01:18 +00:00
Shengliang Guan 1ae860b0c6 TD-1899 2020-11-17 22:49:04 +08:00
Haojun Liao 91dcb46d73 [TD-225] fix memory leaks. 2020-11-17 17:45:11 +08:00
Bomin Zhang ca1cf67ecd [TD-2106]<fix>: cannot find table by alias 2020-11-17 17:41:47 +08:00
Haojun Liao 6852339a0d [TD-225] 2020-11-17 17:41:09 +08:00
Haojun Liao 80323814b7 [TD-225] fix bugs. 2020-11-17 17:39:10 +08:00
Shengliang Guan 98d254d521 Merge remote-tracking branch 'origin/develop' into feature/wal 2020-11-17 09:22:50 +00:00
Shengliang Guan c230d2ec0e TD-2014 2020-11-17 09:15:41 +00:00
Haojun Liao 922497b3c2 [TD-225] fix memory leaks. 2020-11-17 16:06:15 +08:00
Haojun Liao e774e8b3a0 [TD-2070]<enhance>: improve project query performance. 2020-11-17 16:03:45 +08:00
Shengliang Guan ed8b8a4149 change epoll wait times for cpu usage 2020-11-17 06:50:26 +00:00
Shengliang Guan a4e576b886
Merge pull request #4259 from taosdata/hotfix/TD-2121 
[TD-2121]<hotfix>: fix coredump when commit failed
 2020-11-17 14:18:11 +08:00
Shengliang Guan 04832fde1a
Merge pull request #4260 from taosdata/feature/wal 
[TD-2051]<fix>: taosd will crash if there a hostame not exist  #4249
 2020-11-17 14:17:34 +08:00
huili 3ff617af1e
Merge pull request #4262 from taosdata/feature/TD-2088 
fix skiplist put batch bug
 2020-11-17 14:16:34 +08:00
Hongze Cheng a0b44608a9 fix skiplist put batch bug 2020-11-17 05:47:38 +00:00
haojun Liao 408246dc27
Merge pull request #4256 from taosdata/hotfix/TD-2096 
[TD-2096]<fix>: apercentile on super table  crash
 2020-11-17 12:51:36 +08:00
Shengliang Guan 33012d3d20 TD-2051 2020-11-17 03:36:52 +00:00
Shengliang Guan 5342c811aa Merge branch 'feature/wal' of https://github.com/taosdata/TDengine into feature/wal 2020-11-17 03:03:57 +00:00
Shengliang Guan bf3e692374 TD-2065 2020-11-17 03:03:07 +00:00
haojun Liao 59db07cc43
Merge pull request #4241 from taosdata/feature/query 
Feature/query
 2020-11-17 10:53:40 +08:00
Hongze Cheng db3f4ea12f [TD-2121]<hotfix>: fix coredump when commit failed 2020-11-17 10:50:06 +08:00
Shengliang Guan 69964079e6 TD-1924 2020-11-17 02:47:59 +00:00
Shengliang Guan a5003c23ec
Merge pull request #4257 from taosdata/feature/wal 
Feature/wal
 2020-11-17 10:34:01 +08:00
Shengliang Guan 767f78cb24 TD-2116 2020-11-17 09:50:22 +08:00
Haojun Liao 55bff9b5b0 [TD-225] 2020-11-16 22:46:40 +08:00
Haojun Liao 3f20f177c8 [TD-225] fix memory leaks. 2020-11-16 22:44:31 +08:00
yihaoDeng f4a92907f2 fix compile bug 2020-11-16 13:48:11 +00:00
yihaoDeng 8f46f81f71 Merge branch 'develop' into test1 2020-11-16 13:39:09 +00:00
yihaoDeng 961757ffca [TD-2096]<fix>: apercentile on super table crash 2020-11-16 13:21:47 +00:00
huili 8d9a0d7b44
Merge pull request #4221 from taosdata/hotfix/TD-2006 
memory may corruption
 2020-11-16 20:49:51 +08:00
huili c1e168e615
Merge pull request #4246 from taosdata/hotfix/test 
[NONE]
 2020-11-16 20:49:19 +08:00
huili 1af6ea5cf7
Merge pull request #4216 from taosdata/hotfix/TD-1839 
TD-1839<fix>: insert invalid file return invalid response
 2020-11-16 20:00:07 +08:00
huili 69fe86bccd
Merge pull request #4173 from taosdata/hotfix/TD-2026 
[TD-2026]<fix>: 'show create table' return unexpected column len
 2020-11-16 19:58:58 +08:00
huili 9711afc539
Merge pull request #4227 from taosdata/hotfix/TD-1785 
[TD-1785]<fix>: taos_close may fail
 2020-11-16 19:56:30 +08:00
Hui Li 021ea48b55 [TD-2101]<fix> prevent buf overflow when write insert sql 2020-11-16 19:55:25 +08:00
huili 924c4de433
Merge pull request #4248 from taosdata/feature/TD-1869 
Feature/td 1869
 2020-11-16 18:57:08 +08:00
Haojun Liao 25b47131c8 [TD-225] 2020-11-16 18:52:32 +08:00
Haojun Liao befea7f032 [TD-225] 2020-11-16 18:46:36 +08:00
Shengliang Guan 8fac5b6a38 TD-2116 2020-11-16 10:38:16 +00:00
yihaoDeng 325bb79aab resolve conflict 2020-11-16 10:32:45 +00:00
Haojun Liao a33e30622c [TD-225] 2020-11-16 18:29:27 +08:00
yihaoDeng 08e6c5ecf6 [TD-1786]<fix>: failure of taos_clos may cause core 2020-11-16 10:27:16 +00:00
Shengliang Guan 0150c5cea4 TD-2087 2020-11-16 10:22:53 +00:00
Shengliang Guan 8b66fa1596
Merge pull request #4244 from taosdata/feature/TD-2066 
Feature/td 2066
 2020-11-16 18:18:42 +08:00
Shengliang Guan 88e6b8311b compile in windows 2020-11-16 16:56:20 +08:00
Hongze Cheng 1b7945d4db fix compile error 2020-11-16 16:42:08 +08:00
Hongze Cheng 9ac87c381c add commit code to TSDB 2020-11-16 16:39:40 +08:00
Shengliang Guan 4cad46a8ea
Merge pull request #4243 from taosdata/feature/TD-2066 
[TD-2066]<feature>: pass error code when commit failed
 2020-11-16 16:27:15 +08:00
Hui Li f9eeaa1b19 [NONE] 2020-11-16 16:07:09 +08:00
Shengliang Guan 7b3ef9e793
Merge pull request #4233 from taosdata/feature/wal 
TD-2111
 2020-11-16 16:03:46 +08:00
Hongze Cheng a803f24045 [TD-2066]<feature>: pass error code when commit failed 2020-11-16 16:00:57 +08:00
Haojun Liao 312b8a9df6 [TD-225] 2020-11-16 15:18:52 +08:00
Haojun Liao 2a83bdd3b2 Merge branch 'develop' into feature/query 2020-11-16 15:15:21 +08:00
huili 80791effdf
Merge pull request #4240 from taosdata/hotfix/test 
[NONE]
 2020-11-16 15:13:41 +08:00
Haojun Liao 650aad166a [TD-225] refactor code. 2020-11-16 15:10:48 +08:00
Hui Li a8eb725de4 [NONE] 2020-11-16 14:54:27 +08:00
Haojun Liao d5aa32bf35 [TD-2060] 2020-11-16 14:45:10 +08:00
Haojun Liao 875149dde2 [TD-2060] 2020-11-16 14:39:00 +08:00
Hongze Cheng fb7fd4b822 Merge branch 'develop' into feature/TD-2088 2020-11-16 14:15:02 +08:00
Hongze Cheng 176d247efc resolve some static scan error 2020-11-16 14:11:26 +08:00
huili 7a16fd4569
Merge pull request #4236 from taosdata/hotfix/test 
Hotfix/test
 2020-11-16 13:24:22 +08:00
Hui Li 5d61ea87f0 [TD-2101]<feature> release taosdump for install package 2020-11-16 12:42:24 +08:00
Hui Li 71e99dced0 [TD-2101]<feature> release taosdump for install package 2020-11-16 12:42:00 +08:00
Haojun Liao 07ecde0714 [TD-2110] 2020-11-16 11:49:38 +08:00
Shengliang Guan aba0e02db0 TD-2111 2020-11-16 03:24:39 +00:00
Hongze Cheng ec149ac4d0 Merge branch 'develop' into feature/TD-2088 2020-11-16 09:57:15 +08:00
zjd1988 d06dc6ff6d current codes not work as expedted 2020-11-16 09:13:10 +08:00
Shengliang Guan d9963d3eaa
Merge pull request #4228 from taosdata/feature/wal 
Feature/wal
 2020-11-15 20:30:23 +08:00
Shengliang Guan 79cf4d6027 TD-1924 2020-11-15 11:37:17 +08:00
yihaoDeng e5113c58e8 Merge branch 'develop' into test2 2020-11-15 00:55:42 +00:00
yihaoDeng d0a3e421db Merge branch 'develop' into test 2020-11-15 00:28:57 +00:00
yihaoDeng a8b7c1e512 [TD-1785]<fix>: taos_close may fail 2020-11-14 16:35:23 +00:00
yihaoDeng db1ae55860 [TD-1785]<fix>: taos_close may fail 2020-11-14 16:20:00 +00:00
yihaoDeng 590682391b [TD-1785]<fix>: taos_close may fail 2020-11-14 16:05:46 +00:00
Hongze Cheng dfb0921c1f fix coredump 2020-11-14 21:40:55 +08:00
Jeff Tao 72491dc5b7 return reference ID via parameter instead of return value 2020-11-14 13:17:28 +00:00
Shengliang Guan f94431100d log 2020-11-14 09:07:54 +00:00
Hongze Cheng 9e87f232d8 Merge branch 'develop' into feature/TD-2088 2020-11-14 08:52:35 +00:00
Hongze Cheng a3580fd06f implement TD-2088 2020-11-14 08:51:21 +00:00
yihaoDeng 38a8609993 memory may corruption 2020-11-14 05:50:05 +00:00
Shengliang Guan 45039b1cc9
Merge pull request #4220 from taosdata/feature/wal 
TD-2087
 2020-11-14 13:29:37 +08:00
Haojun Liao c8832d65fb [TD-225] 2020-11-14 13:09:38 +08:00
Haojun Liao 21388a3b0f [TD-225] 2020-11-14 11:50:50 +08:00
Haojun Liao 6b0b783aaf [TD-225] 2020-11-14 11:06:42 +08:00
Haojun Liao 922711df1f Merge branch 'develop' into feature/query 2020-11-14 10:58:37 +08:00
Haojun Liao ef960e90de Merge branch 'develop' into feature/query 2020-11-14 10:54:58 +08:00
Shengliang Guan 4c56bf4e26 TD-2087 2020-11-14 10:09:04 +08:00
Hongze Cheng 6272bd4a67 Merge branch 'develop' into feature/TD-2088 2020-11-14 01:47:57 +00:00
Shengliang Guan e8f6c7b481
Merge pull request #4209 from taosdata/hotfix/TD-2081 
[TD-2081]<hotfix>: fix alter blocks problem
 2020-11-13 23:41:13 +08:00
Shengliang Guan fd9ca4c72e
Merge pull request #4218 from taosdata/patch/TD-2079 
taosAcquireRef return a pointer, not an integer
 2020-11-13 23:40:45 +08:00
Shengliang Guan 807e181b43
Merge pull request #4217 from taosdata/feature/wal 
Feature/wal
 2020-11-13 23:39:06 +08:00
Jeff Tao 98e3431eaf taosAcquireRef return a pointer, not an integer 2020-11-13 14:07:59 +00:00
yihaoDeng 885d546783 TD-1839<fix>: insert invalid file return invalid response 2020-11-13 11:16:36 +00:00
Shengliang Guan 66f104bbfa TD-1982 definite lost while forward msg 2020-11-13 11:08:59 +00:00
Hongze Cheng 98837549f3 simple change 2020-11-13 10:54:43 +00:00
Shengliang Guan d5cd0ae9cb TD-1948 2020-11-13 10:03:24 +00:00
Shengliang Guan 9fd8ed5239 Merge from feature/table 2020-11-13 09:57:17 +00:00
Hui Li f11d214c30 [TD-2078]<fix> read double data error 2020-11-13 17:46:14 +08:00
Shengliang Guan 3a9b539213 TD-1948 2020-11-13 09:44:22 +00:00
Shengliang Guan 150d6c8f3a compile error in windows 2020-11-13 17:06:42 +08:00
Shengliang Guan 4e42b8cf5e TD-1948 2020-11-13 08:46:02 +00:00
Shengliang Guan f7c9b2bb40 Merge remote-tracking branch 'origin/develop' into feature/table 2020-11-13 08:41:18 +00:00
Shengliang Guan 141cc3d188 TD-1948 2020-11-13 08:23:32 +00:00
Shengliang Guan 68078a6cab TD-2086 2020-11-13 08:12:11 +00:00
huili 7bbda1b95b
Merge pull request #4210 from taosdata/feature/TD-1986 
[TD-1986]<fix>: default days to 10 instead of 2
 2020-11-13 15:47:59 +08:00
Shengliang Guan 3cfd246dbe
Merge pull request #4205 from taosdata/feature/wal 
TD-1982
 2020-11-13 15:46:00 +08:00
huili 8d29b11b2d
Merge pull request #4213 from taosdata/hotfix/test 
[update]
 2020-11-13 15:25:20 +08:00
Shengliang Guan 7651b6e43a Merge remote-tracking branch 'origin/develop' into feature/wal 2020-11-13 07:11:52 +00:00
Haojun Liao b3d582bb45 [TD-225] 2020-11-13 15:04:16 +08:00
Hui Li fa7f625f05 [update] 2020-11-13 15:01:20 +08:00
Shengliang Guan 8846c07814 Merge remote-tracking branch 'origin/develop' into feature/wal 2020-11-13 06:34:28 +00:00
Hongze Cheng 2b90bb6564 [TD-2084]<hotfix>: invalid read when close TSDB 2020-11-13 14:09:11 +08:00
Haojun Liao e2125102c8 [TD-225] 2020-11-13 14:01:36 +08:00
Minglei Jin c26e1a9076 [TD-1986]<fix>: default days to 10 instead of 2 2020-11-13 00:55:11 -05:00
Haojun Liao 29545fa560 [TD-225] 2020-11-13 13:46:33 +08:00
Shengliang Guan a400451dae TD-2085 2020-11-13 05:43:55 +00:00
Haojun Liao e59ee37c85 [TD-1955]<fix>: fix bugs in refresh threads 2020-11-13 13:36:42 +08:00
Haojun Liao 8801d354e1 [TD-225] 2020-11-13 13:34:28 +08:00
huili f197b4a27b
Merge pull request #4206 from taosdata/feature/TD-2052 
Feature/td 2052
 2020-11-13 13:32:33 +08:00
Haojun Liao 4cea435940 [TD-225] 2020-11-13 13:17:56 +08:00
zyyang 0b6e8c0a97 change 2020-11-13 13:15:58 +08:00
Haojun Liao 2da4b6743e [TD-225] 2020-11-13 13:07:04 +08:00
Hongze Cheng ff928289df [TD-2081]<hotfix>: fix alter blocks problem 2020-11-13 12:04:21 +08:00
Haojun Liao 067ee44bdb [TD-225] 2020-11-13 11:48:53 +08:00
Haojun Liao 0f63a29b58 [TD-225] 2020-11-13 11:44:28 +08:00
Haojun Liao bf3ff27d5f [TD-225] merge develop 2020-11-13 11:23:19 +08:00
yihaoDeng faa1b259c0 [TD-2026]<fix>: 'show create table' return unexpected column len 2020-11-12 18:06:50 +00:00
Shengliang Guan bc37939fee TD-1982 2020-11-12 10:38:37 +00:00
Shengliang Guan d4a5104ce4 Merge remote-tracking branch 'origin/develop' into feature/wal 2020-11-12 15:44:56 +08:00
Shengliang Guan 5a417fddd8 TD-2072 2020-11-12 06:48:46 +00:00
Shengliang Guan f6ee376fb6 TD-2072 2020-11-12 06:19:44 +00:00
Shengliang Guan 9d65e0e505 TD-2072 2020-11-12 06:16:04 +00:00
Shengliang Guan 04338e8eb5 log 2020-11-12 06:10:23 +00:00
Shengliang Guan 9d8beb6598 TD-2072 2020-11-12 06:03:14 +00:00
Hui Li b97d4ade4d Merge branch 'develop' into hotfix/test 2020-11-12 13:56:58 +08:00
Shengliang Guan a31a6ed9a5 TD-2072 2020-11-12 05:39:22 +00:00
huili 55de47d1f2
Merge pull request #4183 from taosdata/bugfix/TD-2055 
[TD-2055]<fix>: core dump in wildcard query
 2020-11-12 13:32:37 +08:00
huili c59ab92bc6
Merge pull request #4192 from taosdata/bugfix/td-1998 
[TD-1998]<fix>: cannot parse valid sql statement
 2020-11-12 13:32:13 +08:00
Shengliang Guan b5d1aa4801 TD-1985 2020-11-12 05:27:06 +00:00
Haojun Liao 645514c4a6 [TD-225] 2020-11-12 11:03:51 +08:00
Shengliang Guan 028e62c974 TD-2067 2020-11-11 23:45:10 +08:00
Shengliang Guan ab6387cae2 log error while client version not matched with server version 2020-11-11 23:34:21 +08:00
Shengliang Guan a4cb007d69 TD-1896 2020-11-11 23:26:20 +08:00
Shengliang Guan 40728d1b31 TD-1949 2020-11-11 22:38:46 +08:00
Haojun Liao b8ffb3b047 [TD-225] 2020-11-11 21:45:14 +08:00
Shengliang Guan 59b25a96d7 TD-1896 2020-11-11 20:21:37 +08:00
Shengliang Guan cfe2e67fa2
Merge pull request #4194 from taosdata/feature/wal 
Feature/wal
 2020-11-11 20:10:25 +08:00
Haojun Liao cb5bc95969 [TD-225] 2020-11-11 19:02:23 +08:00
Bomin Zhang de74b9ccfc [TD-1998]<fix>: cannot parse valid sql statement 2020-11-11 18:44:16 +08:00
Shengliang Guan d2b2e6a02c add log 2020-11-11 10:39:54 +00:00
Hongze Cheng 3236104b54 [TD-2004]<feature>: use queue to implement commit 2020-11-11 18:34:51 +08:00
Hongze Cheng e00987e63c Merge branch 'develop' into feature/TD-2004 2020-11-11 18:17:07 +08:00
Hongze Cheng bd5f2641a8 implement TD-2059 2020-11-11 18:16:53 +08:00
Shengliang Guan 66e7719e5d Merge remote-tracking branch 'origin/develop' into feature/wal 2020-11-11 09:51:43 +00:00
Shengliang Guan 57269fd737 add some log 2020-11-11 09:51:11 +00:00
Shengliang Guan f4c196a4f7
Merge pull request #4184 from taosdata/feature/wal 
Feature/wal
 2020-11-11 17:44:42 +08:00
Hui Li 3a3fe63eab [TD-1973]<fix> no free result source in callback when use async api 2020-11-11 17:12:40 +08:00
Shengliang Guan 101e0bb1d2 TD-1949 2020-11-11 09:12:22 +00:00
Hongze Cheng 13856ea98c Merge branch 'develop' into feature/TD-2004 2020-11-11 17:00:58 +08:00
Shengliang Guan 6ea61b4916 revert codes 2020-11-11 08:43:50 +00:00
Hongze Cheng 41bff0ab70 Merge branch 'develop' into feature/TD-2061 2020-11-11 15:07:25 +08:00
huili fa8de23f9e
Merge pull request #4174 from taosdata/hotfix/test 
[2028]<feature> add C# connector for windows
 2020-11-11 14:48:00 +08:00
Bomin Zhang e9f848f635 [TD-2055]<fix>: core dump in wildcard query 2020-11-11 14:31:44 +08:00
Shengliang Guan 9730ad8eba TD-2041 2020-11-11 14:30:12 +08:00
Shengliang Guan 6879c14ee8 Merge branch 'feature/wal' of https://github.com/taosdata/TDengine into feature/wal 2020-11-11 14:30:08 +08:00
Hongze Cheng c7285a96f0 implement TD-2061 2020-11-11 06:29:33 +00:00
Shengliang Guan 50368482a7 Merge branch 'feature/wal' of https://github.com/taosdata/TDengine into feature/wal 2020-11-11 14:28:54 +08:00
Shengliang Guan 23fba63413 TD-2041 2020-11-11 06:28:21 +00:00
zyyang 9bfa0c8eb8 [TD-2052]<feature>: common connection pool demos 2020-11-11 11:51:13 +08:00
Shengliang Guan c57777c4a1 TD-2041 2020-11-10 22:55:38 +08:00
Haojun Liao ec9042a6e8 [TD-1943]<fix>: fix memory leak. 2020-11-10 22:53:23 +08:00
Haojun Liao fcdc8512d2 [TD-1980] release mem/imem table reference once the data in cache are all scanned. 2020-11-10 22:50:34 +08:00
Shengliang Guan 545a31f4bf
Merge pull request #4177 from taosdata/feature/wal 
[TD-2944]<fix>:Inaccurate error code when the SQL in restful interface fails
 2020-11-10 22:48:35 +08:00
Haojun Liao 8d1c2d377d [TD-2036] refactor code 2020-11-10 22:45:12 +08:00
Haojun Liao 5178b4ffe8 [TD-2036]<fix>: fix arithmetic query error in the client. 2020-11-10 21:47:50 +08:00
Jeff Tao cc74b689fc add some notes on tqueue.c 2020-11-10 13:00:31 +00:00
Shengliang Guan caa7f06d84 change int to int32_t 2020-11-10 09:51:46 +00:00
Shengliang Guan 86d78a2927 TD-2044 2020-11-10 09:39:50 +00:00
Hui Li 031ab3b737 [2028]<feature> add C# connector for windows 2020-11-10 17:19:14 +08:00
Shengliang Guan a5fdb78794 change int to int32_t 2020-11-10 08:03:02 +00:00
yihaoDeng 10084dbb97 [TD-2026]<fix>: 'show create table' return unexpected column len 2020-11-10 07:26:30 +00:00
Shengliang Guan 42693517ae TD-1848 2020-11-10 07:09:25 +00:00
Shengliang Guan 6854e550a2 TD-1793 2020-11-10 06:48:31 +00:00
Shengliang Guan 95d3e55042 TD-1848 2020-11-10 06:44:12 +00:00
Hongze Cheng 941834a659 try to fix TD-2004 2020-11-10 05:39:09 +00:00
Shengliang Guan 4c34bb5324 TD-1793 2020-11-10 03:36:13 +00:00
Haojun Liao 837701752c [TD-225] 2020-11-10 10:32:43 +08:00
yihaoDeng 01d1782d5b rewrite async write 2020-11-10 01:28:05 +00:00
freemine d583a4ca39 Merge remote-tracking branch 'upstream/develop' into odbc-win 2020-11-10 08:24:33 +08:00
yihaoDeng d1c9131772 add async write 2020-11-09 23:55:07 +00:00
Haojun Liao 909ca7edeb [TD-225] 2020-11-09 20:00:28 +08:00
Shengliang Guan a15f7c6f1d
Merge pull request #4166 from taosdata/feature/wal 
add log for wal
 2020-11-09 18:24:56 +08:00
Shengliang Guan bf7f70554b
Merge pull request #4164 from taosdata/hotfix/TD-1883 
[TD-1883]<fix>: fix memory leak when resultSet pointer is null
 2020-11-09 18:02:40 +08:00
zyyang a0876eb776 [TD-1883]<fix>: fix memory leak when resultSet pointer is null 2020-11-09 16:52:42 +08:00
Haojun Liao 9487c1b9c6 [TD-1978] 2020-11-09 16:24:25 +08:00
Shengliang Guan 98e380be51 add log for wal 2020-11-09 05:41:58 +00:00
Haojun Liao 2b9a3b1e1b [TD-1978] 2020-11-09 13:29:12 +08:00
Haojun Liao 276b7a6dbb [TD-1978] 2020-11-09 11:31:13 +08:00
Shengliang Guan 13e35660ef change ulog to slog in taosTcpPool 2020-11-09 02:16:59 +00:00
Haojun Liao 7314a0dd08 [TD-1978] 2020-11-08 23:17:01 +08:00
Shengliang Guan 6b066bcf1a TD-1919 2020-11-08 14:46:12 +00:00
Shengliang Guan 32f1046875 format 2020-11-08 13:59:37 +00:00
Shengliang Guan 4f0ed07921 TD-1919 change version type to uint64 2020-11-08 13:56:41 +00:00
Shengliang Guan 047955ab1b change int to int32 2020-11-08 13:26:54 +00:00
Shengliang Guan a194ea05b3 change wal cfg options 2020-11-08 13:19:32 +00:00
Shengliang Guan 83d2acd5bb
Merge pull request #4149 from taosdata/feature/table 
Feature/table
 2020-11-08 10:28:45 +08:00
Shengliang Guan c91ca88eaf
Merge pull request #4148 from taosdata/hotfix/sangshuduo/fix-centos-7-build-issue 
Hotfix/sangshuduo/fix centos 7 build issue
 2020-11-08 10:00:26 +08:00
Shengliang Guan 1d227a1dd1
Merge pull request #4146 from taosdata/hotfix/sangshuduo/fix-taosdemo-output-big-number 
[TD-1974] <fix>: fix big number result output issue.
 2020-11-08 09:59:51 +08:00
Shengliang Guan 907da16f98
Merge pull request #4144 from taosdata/feature/query 
[TD-1777]<fix>: free mem lock asap.
 2020-11-08 09:59:22 +08:00
freemine 9081fd67aa Merge remote-tracking branch 'upstream/develop' into odbc-win 2020-11-08 09:08:56 +08:00
freemine 61e2195b55 ConfigDSN windows port' 2020-11-08 08:00:29 +08:00
Shuduo Sang 604e2304fb use _GNU_SOURCE instead of _POSIX_C_SOURCE 2020-11-07 22:19:56 +08:00
Shuduo Sang 774356add1 [TD-1975] <fix>: fix build issue on CentOS 7. 2020-11-07 21:40:33 +08:00
Shuduo Sang c1905a921a fix one more place. 2020-11-07 21:27:08 +08:00
Shuduo Sang ff690a8c63 [TD-1974] <fix>: fix big number result output issue. 2020-11-07 20:46:51 +08:00
freemine 557aa20d32 1. setup dll functions (ConfigDSN ...) compiled and exported only on windows 
2. add 'Server' key in Odbc.ini to allow connecting server other than localhost
   via DSN
 2020-11-07 10:41:30 +08:00
Haojun Liao ff8930f903 [TD-1777]<fix>: free mem lock asap. 2020-11-07 10:32:10 +08:00
freemine 6c0c319baf implement ConfigDSN for windows' 2020-11-06 23:14:18 +08:00
freemine 12d629024a implement windows odbc setup api 2020-11-06 20:13:50 +08:00
yihaoDeng 41dce83a03 [TD-1970]<fix>: column name for select last(*)/first(*)/last_row(*) is not correct 2020-11-06 10:16:20 +00:00
Shengliang Guan 3cf86c92ce Merge remote-tracking branch 'origin/develop' into feature/table 2020-11-06 15:08:24 +08:00
Shengliang Guan 4735b224ef change read/write to taosRead/Write 2020-11-06 06:25:06 +00:00
Shengliang Guan 9d95c7f6e6 Merge remote-tracking branch 'origin/develop' into feature/file 2020-11-06 06:09:51 +00:00
Shengliang Guan 7fa7be7a8a TD-1915 2020-11-06 13:28:12 +08:00
freemine 51c4b89aac before windows port 2020-11-06 12:42:51 +08:00
Jeff Tao a191917452 change head file 2020-11-06 03:59:43 +00:00
Shengliang Guan d78c54fb0b TD-1915 2020-11-06 11:40:12 +08:00
Shengliang Guan c0d6c718c6
Merge pull request #4060 from taosdata/feature/update 
Feature/update
 2020-11-06 11:30:33 +08:00
Shengliang Guan c3773983f9
Merge pull request #4133 from taosdata/feature/query 
Feature/query
 2020-11-06 11:26:17 +08:00
Haojun Liao 1fed1db16a [TD-225] 2020-11-06 11:02:33 +08:00
Shengliang Guan e4e86609b1 TD-1915 2020-11-06 10:40:38 +08:00
Haojun Liao 2b07f83bbe [TD-225] 2020-11-06 10:27:19 +08:00
Hongze Cheng d5db0347cf Merge branch 'develop' into feature/update 2020-11-06 09:48:54 +08:00
Jeff Tao 1e34d8ca9a minor changes, dont set terrno 2020-11-06 01:37:59 +00:00
Shengliang Guan 4bc9284a76 TD-1915 2020-11-06 09:31:29 +08:00
Jeff Tao 4902effb55 data type for rid 2020-11-06 01:27:37 +00:00
Jeff Tao ecdd067900 size_t type conversion 2020-11-06 01:20:53 +00:00
Jeff Tao 5ffa312614 return -1 if error happens 2020-11-06 01:10:08 +00:00
Jeff Tao 54a50d66e5 type conversion 2020-11-06 00:54:51 +00:00
Jeff Tao 10e951eb2e fix bug in tfile 2020-11-06 00:39:39 +00:00
Jeff Tao 9bf73b64c3 minor changes on debug info 2020-11-05 15:18:34 +00:00
Haojun Liao bd87ba990c [TD-225] fix memory leak. 2020-11-05 23:08:42 +08:00
Jeff Tao cb0fcf10d5 minor changes 2020-11-05 14:40:20 +00:00
Shengliang Guan c1d7a1a7ba
Merge pull request #4124 from taosdata/feature/table 
Feature/table
 2020-11-05 22:35:19 +08:00
Haojun Liao b6d40d3ebf [TD-1941]<fix>: fix client crash in join query while connection broken. 2020-11-05 22:27:01 +08:00
Jeff Tao 9605658fab Merge branch 'develop' into feature/file 2020-11-05 13:28:52 +00:00
Jeff Tao acc5c53b12 make changes on app 2020-11-05 13:15:23 +00:00
Shengliang Guan 048d0a46c5 Merge remote-tracking branch 'origin/develop' into feature/table 2020-11-05 11:35:19 +00:00
Shengliang Guan ea374b6f86 TD-1915 2020-11-05 11:34:40 +00:00
Shengliang Guan 017efaa924
Merge pull request #4123 from taosdata/feature/query 
[TD-225]
 2020-11-05 19:26:42 +08:00
Haojun Liao 16219bc630 [TD-225] 2020-11-05 19:15:20 +08:00
Jeff Tao 6ca2968862 TD-1944 2020-11-05 10:58:28 +00:00
Shengliang Guan 5b3d0de310
Merge pull request #4118 from taosdata/feature/query 
Feature/query
 2020-11-05 17:43:25 +08:00
Shengliang Guan 83f71e2463 TD-1847 2020-11-05 09:29:26 +00:00
Haojun Liao 37f485a98a [TD-1875]<fix>: disable group by in join query. 2020-11-05 17:12:38 +08:00
Haojun Liao a1fc9d8061 [TD-1940]<fix> :fix bug in join query. 2020-11-05 16:55:21 +08:00
Shengliang Guan f07f456b08 TD-1948 2020-11-05 08:40:53 +00:00
Shengliang Guan b037302b3c TD-1949 2020-11-05 08:21:22 +00:00