Commit Graph

6669 Commits

Author SHA1 Message Date
Haojun Liao 51a8b29a8f [TD-2298] 2020-12-03 13:29:13 +08:00
Shengliang Guan 1408a331f1 TD-2270 rename files 2020-12-03 13:24:18 +08:00
Shengliang Guan 1993fbc480 TD-2270 2020-12-03 13:19:28 +08:00
Shengliang Guan b39b84e6d8 TD-2270 rename files 2020-12-03 13:02:06 +08:00
Shengliang Guan ca87041503 TD-2270 2020-12-03 13:00:13 +08:00
Bomin Zhang ef901f1077 [TD-2309]<feature>: add config option to enable/disable stream (continuous query) 2020-12-03 03:39:28 +00:00
Haojun Liao caeabf3821 [TD-225] refactor codes. 2020-12-03 10:33:40 +08:00
Haojun Liao d59b8f18da [TD-2298] 2020-12-03 10:32:55 +08:00
Shengliang Guan 551827eb2b TD-2270 2020-12-02 22:53:52 +08:00
Shengliang Guan acf5cc1c35
Merge pull request #4404 from taosdata/enhance/TD-2263
[TD-2263]<enhance>: debug log epSet.fqdn when connect success
2020-12-02 19:12:49 +08:00
Haojun Liao 597dd6341c [TD-225] 2020-12-02 18:46:28 +08:00
Haojun Liao c121f5b7b9 [TD-225] refactor codes. 2020-12-02 18:44:32 +08:00
Haojun Liao 8103620575 [TD-225] refactor codes. 2020-12-02 18:43:23 +08:00
Haojun Liao 0c38e1d9d3 [TD-2298]<fix>: fix taosd crash during table interval query. 2020-12-02 18:37:28 +08:00
Haojun Liao 6b2d676ac1 [TD-2293]add parameters in query message. 2020-12-02 15:43:50 +08:00
Haojun Liao 5746fdabe7 [TD-2129] refactor codes. 2020-12-02 15:28:34 +08:00
Haojun Liao b55548782b [TD-2293]<enhance>: improve projection query performance for super table. 2020-12-02 15:23:34 +08:00
Bomin Zhang e690846ce8 fix td-2290 2020-12-02 06:34:51 +00:00
Shengliang Guan 083a93bc42
Merge pull request #4409 from taosdata/feature/TD-2255
[TD-2255]<fix>: fix incorrect log variable and sim test cases
2020-12-02 12:55:07 +08:00
stephenkgu 37d39c9e73 [TD-2255]<fix>: fix incorrect log variable and sim test cases 2020-12-02 03:50:02 +00:00
stephenkgu 2553ae59f3 Merge branch 'develop' into enhance/TD-2263 2020-12-02 01:14:30 +00:00
Shengliang Guan c7ebda0b37 TD-1843 2020-12-01 11:33:41 +00:00
stephenkgu 8072b26a2f [TD-2263]<enhance>: debug log epSet.fqdn when connect success 2020-12-01 19:04:05 +08:00
Shengliang Guan 6517eaf048
Revert "return mnode initialization stage to client" 2020-12-01 17:59:50 +08:00
Haojun Liao 43a3f513c4 [TD-2129] 2020-12-01 17:01:44 +08:00
Haojun Liao c3c7643fac [TD-2277]<fix>: fix invalid column type in stable query. 2020-12-01 16:59:25 +08:00
Shengliang Guan 3f8118c9f6
Merge pull request #4397 from taosdata/feature/TD-2255
[TD-2255]<enhance>: make db options days and keep error message more …
2020-12-01 15:01:41 +08:00
Shengliang Guan e915f8d932
Merge pull request #4396 from taosdata/feature/wal
Feature/wal
2020-12-01 15:01:02 +08:00
Haojun Liao dcb0bc49e8 [TD-2129] 2020-12-01 13:20:53 +08:00
stephenkgu c1b4615350 [TD-2255]<enhance>: make db options days and keep error message more clear 2020-12-01 13:19:32 +08:00
Shengliang Guan 564bd50505 Merge remote-tracking branch 'origin/develop' into feature/TD-1843 2020-12-01 04:29:34 +00:00
Shengliang Guan 716a82db68 Merge remote-tracking branch 'origin/develop' into feature/wal 2020-12-01 11:53:11 +08:00
Shengliang Guan bbafebfbee TD-1926 2020-12-01 11:52:43 +08:00
Jeff Tao 7fadd4cb3a remove a potential rpcSendRecv deadlock if rpcClose is called by another thread 2020-12-01 03:48:24 +00:00
Jeff Tao 4e0f1055dc remove a potential rpcSendRecv deadlock 2020-12-01 03:44:37 +00:00
Bomin Zhang 892e2599ec
Revert "[TD-2268]: cancel all related timers in taosTmrCleanUp" 2020-12-01 11:20:14 +08:00
Shengliang Guan 5a0ee04b25
Merge pull request #4385 from taosdata/bugfix/TD-2265
fix TSDB_MAX_ALLOWED_SQL_LEN from 8MB to 1MB
2020-12-01 09:12:06 +08:00
Shengliang Guan 2d410638b8 Merge branch 'feature/wal' of https://github.com/taosdata/TDengine into feature/wal 2020-11-30 19:01:31 +08:00
Shengliang Guan ece8c47514 TD-1926 2020-11-30 19:01:25 +08:00
Shengliang Guan 2e69b78fcd TD-2283 2020-11-30 10:32:12 +00:00
Jeff Tao e13de8ce2c return mnode initialization stage to client 2020-11-30 09:12:42 +00:00
haojun Liao 21a0c74106
Merge pull request #4384 from taosdata/bugfix/td-2140
Bugfix/td 2140
2020-11-30 17:08:21 +08:00
Bomin Zhang 2b11f6ab4e [TD-2140]: fix invalid write 2020-11-30 08:42:42 +00:00
Hongze Cheng eebed5c210 fix TD-2279 2020-11-30 08:16:58 +00:00
stephenkgu a432168ae5 [TD-2265]<fix>: fix TSDB_MAX_ALLOWED_SQL_LEN from 8MB to 1MB 2020-11-30 14:39:37 +08:00
Bomin Zhang 4c234c707b Merge branch 'develop' into bugfix/td-2140 2020-11-30 05:33:28 +00:00
Shengliang Guan 1f8c70d405
Merge pull request #4383 from taosdata/feature/wal
TD-2276
2020-11-30 13:30:54 +08:00
haojun Liao 055888b76b
Merge pull request #4377 from taosdata/patch/td-2268
[TD-2268]: cancel all related timers in taosTmrCleanUp
2020-11-30 13:21:43 +08:00
haojun Liao c9a725dff4
Merge pull request #4370 from taosdata/bugfix/td-2198
[TD-2198]<fix>: cq can be created more than once
2020-11-30 13:21:01 +08:00
Shengliang Guan dede7188b9 TD-2276 2020-11-30 05:10:22 +00:00
Hui Li d50b8e88e9 [TD-2260]<fix> set default value for some terminal 2020-11-30 10:08:50 +08:00
Hui Li 0b869643f2 [TD-2260]<fix> set default value for some terminal 2020-11-30 09:58:35 +08:00
Shengliang Guan b897d803de TD-2264 2020-11-28 22:08:00 +08:00
Bomin Zhang 1eba3f965e [TD-2268]: cancel all related timers in taosTmrCleanUp 2020-11-28 09:58:11 +00:00
Shengliang Guan 521ae131a3 TD-2266 2020-11-28 15:27:57 +08:00
Haojun Liao ab1a8746e1 [TD-225]fix compiler error. 2020-11-28 11:28:23 +08:00
Haojun Liao 3a02c6b3ad [TD-225]fix compiler error. 2020-11-28 11:23:08 +08:00
Haojun Liao 0c426a2cc6 Merge branch 'develop' into feature/query 2020-11-28 11:20:20 +08:00
Haojun Liao 27a3cff1c5 [TD-2129] 2020-11-28 11:17:22 +08:00
Shengliang Guan a2331e5df6 compile in win64 2020-11-28 09:47:07 +08:00
Shengliang Guan 754ad5ff5b compile error in windows 2020-11-27 23:38:07 +08:00
Shengliang Guan dbe3b6f8f6 TD-1895 2020-11-27 23:27:13 +08:00
Haojun Liao 0e98a4eadb [TD-2129]<fix>: fix bug in twa calculation. 2020-11-27 18:07:33 +08:00
Shengliang Guan 7296733b47 compile error in arm32 2020-11-27 18:03:17 +08:00
Shengliang Guan 055bb48221 Merge remote-tracking branch 'origin/develop' into feature/syncd 2020-11-27 17:22:34 +08:00
Shengliang Guan 6bf39dfa3b TD-1455 TD-2196 2020-11-27 17:16:49 +08:00
Shengliang Guan de7bbc0d96
Merge pull request #4368 from taosdata/patch/TD-1983
Patch/td 1983
2020-11-27 16:16:04 +08:00
Shengliang Guan feb2270a4c change log format 2020-11-27 15:52:38 +08:00
Jeff Tao 15691bfb08 data type compatible with windows 2020-11-27 07:41:35 +00:00
Jeff Tao 4b09f05290 add a removed flag in pNode 2020-11-27 07:23:16 +00:00
Bomin Zhang 6b3c07142a [TD-2198]<fix>: cq can be created more than once 2020-11-27 07:16:09 +00:00
haojun Liao f3aa7cff18
Merge pull request #4359 from taosdata/bugfix/td-2182
[TD-2182]<fix>: coverity issues
2020-11-27 11:47:46 +08:00
haojun Liao c5c611abbf
Merge pull request #4358 from taosdata/patch/td-2135
[TD-2135]<patch>: reduce memory usage
2020-11-27 11:46:08 +08:00
haojun Liao 5f3bb47bc2
Merge pull request #4354 from taosdata/bugfix/td-2216
[TD-2216]<fix>: crash in qUtil.c
2020-11-27 11:45:25 +08:00
Shengliang Guan c7abe34dc4 Merge remote-tracking branch 'origin/develop' into patch/TD-1983 2020-11-27 11:31:03 +08:00
Shengliang Guan 12bee358c1
Merge pull request #4362 from taosdata/hotfix/TD-2184
fix TD-2184
2020-11-27 10:22:59 +08:00
yihaoDeng f349c8af87 TD-2257 2020-11-26 17:34:09 +00:00
Shengliang Guan 09e58c78cf Merge remote-tracking branch 'origin/feature/wal' into feature/syncd 2020-11-26 23:13:23 +08:00
Shengliang Guan 1b402c89c9
Merge pull request #4364 from taosdata/feature/wal
TD-2245
2020-11-26 23:09:35 +08:00
Shengliang Guan 1123038292 TD-2245 2020-11-26 14:24:18 +00:00
Shengliang Guan 1e94822a6a TD-1926 2020-11-26 19:02:11 +08:00
Hongze Cheng 19eccc86ad fix TD-2184 2020-11-26 08:44:20 +00:00
huili 95390f4b62
Merge pull request #4356 from taosdata/hotfix/TD-2132
Hotfix/td 2132
2020-11-26 16:29:10 +08:00
Shengliang Guan a31d9ecefe
Merge pull request #4355 from taosdata/feature/sync
[TD-2166]<fix>: add flow control when synchronizatio fails
2020-11-26 16:15:44 +08:00
Bomin Zhang 55ce69e2f0 [TD-2182]<fix>: coverity issues 2020-11-26 08:00:58 +00:00
Bomin Zhang f547e29a55 [TD-2135]<patch>: reduce memory usage 2020-11-26 07:39:47 +00:00
zyyang e9c83f8251 [TD-2132]<test>: add memory leak test case 2020-11-26 14:33:53 +08:00
Shengliang Guan 810023ca68 TD-1455 TD-2196 2020-11-26 13:13:21 +08:00
Bomin Zhang 4f2d7a1a83 [TD-2216]<fix>: crash in qUtil.c 2020-11-26 04:07:38 +00:00
Shengliang Guan 060299548e change log print 2020-11-26 11:09:46 +08:00
Hui Li aeed9db84c [TD-2230]<fix> use error max len when dump in 2020-11-26 09:27:17 +08:00
Shengliang Guan ffbbb0cc44 TD-1455 TD-2196 2020-11-25 20:36:44 +08:00
Haojun Liao e9e3a6d865 [TD-225]refactor codes. 2020-11-25 19:19:15 +08:00
huili 067eb1f555
Merge pull request #4329 from taosdata/test/testcase
[TD-2125][TD-2173]<feature>python connector
2020-11-25 17:58:34 +08:00
huili b2aadbb896
Merge pull request #4323 from taosdata/feature/TD-1859
Feature/td 1859
2020-11-25 17:54:42 +08:00
Haojun Liao 55a455a854 [TD-2129]<fix>: fix bugs in twa query. 2020-11-25 17:38:20 +08:00
Haojun Liao 1b8256013c [TD-2227]<fix>: remove false error message in the log file while no results returned from server in case of query against super table. 2020-11-25 17:36:44 +08:00
Shengliang Guan d1cd620696 TD-1455 TD-2196 2020-11-25 16:29:02 +08:00
Shengliang Guan 332edab8dc
Merge pull request #4335 from taosdata/feature/wal
[TD-1795]<fix>:If it takes a long time to drop the database, sync confirmation may fail
2020-11-25 16:11:29 +08:00
Haojun Liao 9fba096e46 [TD-2220]<fix>: fix the bug in column arithmetic expression. 2020-11-25 12:13:11 +08:00
Haojun Liao 12bbecc52b [TD-2220]<fix>: fix the bug in column arithmetic expression. 2020-11-25 12:02:23 +08:00
Shengliang Guan 97434ac094 TD-1795 2020-11-25 10:53:46 +08:00
Bomin Zhang 1386c05504 [TD-2140]: remove temporary code 2020-11-25 10:29:25 +08:00
Shengliang Guan a988483a86 TD-1795 2020-11-24 22:36:25 +08:00
Shengliang Guan b12cf2fec5
Merge pull request #4330 from taosdata/feature/wal
[TD-2211]<fix>: Invalid sync version while sync data
2020-11-24 19:54:45 +08:00
zyyang 19dedc226a [TD-2132]<test>: add memory leak test case 2020-11-24 18:34:02 +08:00
Haojun Liao d3352f5511 [TD-225] reduce memory consumption. 2020-11-24 18:27:24 +08:00
Shengliang Guan d14e50ea5a compile error 2020-11-24 18:06:31 +08:00
Shengliang Guan 4d789b0871 TD-2211 2020-11-24 18:05:18 +08:00
liuyq-617 f9c34c9370 [TD-2125][TD-2173]<feature>python connector 2020-11-24 17:27:42 +08:00
Bomin Zhang 53dd2050fd [TD-2140]: use tref to manage sql objects 2020-11-24 17:05:20 +08:00
Haojun Liao 41049dba72 [TD-225] update sim. 2020-11-24 16:51:57 +08:00
Shengliang Guan 99815378bf TD-2086 2020-11-24 14:54:30 +08:00
haojun Liao f3aa56aed0
Merge pull request #4327 from taosdata/feature/query
Feature/query
2020-11-24 12:39:25 +08:00
Haojun Liao c3fd294c0b [TD-225] fix bugs in regression test. 2020-11-24 12:00:17 +08:00
Haojun Liao c17d202e0c [TD-225] fix compiler error. 2020-11-24 11:00:10 +08:00
Haojun Liao e3fc92c9f4 [TD-225] fix bugs. 2020-11-24 10:24:43 +08:00
zyyang 7c9ce88694 change 2020-11-24 09:18:55 +08:00
Shengliang Guan aae38f8b24 add log 2020-11-23 20:08:45 +08:00
Shengliang Guan dbdd70aca1 TD-2196 2020-11-23 11:15:08 +00:00
zyyang 0481d9836f change 2020-11-23 19:12:07 +08:00
zyyang a9e43baa3f change 2020-11-23 19:08:03 +08:00
Haojun Liao f26fc83be8 [TD-2193]<fix>: fix the offset error in arithmetic expression. 2020-11-23 18:59:13 +08:00
zyyang dd9228e067 [TD-1859]<feature>: restful implementation for taos-jdbc 2020-11-23 18:51:13 +08:00
Shengliang Guan 0a90950bdf TD-2157 2020-11-23 10:08:15 +00:00
Haojun Liao 7df4899121 [TD-2180]<fix>: fix coverity issues. 2020-11-23 16:27:04 +08:00
Haojun Liao f55fce8217 [TD-2163]<enhance>: add the version check for query message. 2020-11-23 14:01:10 +08:00
Haojun Liao 5894dded1d [TD-2169]<fix>: fix memory leak in handing the group by binary|nchar type data. 2020-11-23 12:47:34 +08:00
Shengliang Guan b6540b4417 TD-2153 2020-11-23 11:35:38 +08:00
Haojun Liao 227823762c [TD-2175] add test cases. 2020-11-23 11:14:27 +08:00
Haojun Liao 98ba80a993 [TD-225] refactor codes. 2020-11-23 11:13:46 +08:00
Haojun Liao d0e8522840 [TD-2175]<fix>: fix the error in result field name and nchar column length 2020-11-23 11:12:58 +08:00
Shengliang Guan 94e662c9b0 minor changes 2020-11-22 22:51:57 +08:00
Shengliang Guan 38af2df40b TD-2166 2020-11-22 21:06:35 +08:00
Shengliang Guan 212fe11d41 TD-2166 2020-11-22 17:46:23 +08:00
Shengliang Guan 58bbdc3293 TD-2166 add refcount while perform sync 2020-11-22 17:19:34 +08:00
Shengliang Guan 3e43a65331 TD-1983 change hash in mnode 2020-11-21 20:45:06 +08:00
Shengliang Guan 5f3797c11f Merge remote-tracking branch 'origin/develop' into patch/TD-1983 2020-11-21 11:02:55 +08:00
Shengliang Guan a1d247afba
Merge pull request #4306 from taosdata/feature/wal
Feature/wal
2020-11-20 18:26:25 +08:00
haojun Liao 434816e306
Merge pull request #4305 from taosdata/feature/query
[TD-225]
2020-11-20 17:57:24 +08:00
Shengliang Guan 2b887c4140 TD-2000 2020-11-20 17:48:07 +08:00
Haojun Liao 8d2a64b7d4 [TD-225] 2020-11-20 17:30:40 +08:00
Shengliang Guan b07924deec Merge remote-tracking branch 'origin/develop' into feature/wal 2020-11-20 17:18:16 +08:00
Shengliang Guan 66c6e5ba05 change sync log 2020-11-20 16:51:16 +08:00
Shengliang Guan ffed44831f
Merge pull request #4304 from taosdata/feature/wal
TD-2046
2020-11-20 16:02:40 +08:00
Shengliang Guan 7749987f53 compile error 2020-11-20 15:40:10 +08:00
Shengliang Guan 875cd69000 TD-2046 2020-11-20 15:39:00 +08:00
Shengliang Guan f575d942a2 change log format 2020-11-20 15:12:56 +08:00
haojun Liao d4455d1ec3
Merge pull request #4302 from taosdata/feature/query
Feature/query
2020-11-20 14:39:51 +08:00
Shengliang Guan 007af68057 TD-2046 2020-11-20 14:35:27 +08:00
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