Commit Graph

27626 Commits

Author SHA1 Message Date
slguan cacfba83c8 Merge branch 'feature/slguan' of https://github.com/taosdata/TDengine into feature/slguan 2020-02-01 13:50:01 +08:00
slguan 8d4b992f16 failed to connect to server while use secondIp 2020-02-01 13:46:06 +08:00
slguan 3d0c7b4755
Merge pull request #1171 from taosdata/beta/v1.6.5.3
fix bugs #1170.  [tbase-1492]
2020-02-01 00:39:45 +08:00
slguan ccdfc99855
Merge pull request #1169 from taosdata/hjxilinx-patch-1
Update vnodeShell.c
2020-02-01 00:38:46 +08:00
hjxilinx d80ec2aad8 fix bugs #1170. [tbase-1492] 2020-01-31 23:29:39 +08:00
haojun Liao c765f363cd
Update vnodeShell.c 2020-01-31 23:19:13 +08:00
hjxilinx b445e9c4d8 fix bugs. [tbase-266] 2020-01-31 22:55:08 +08:00
slguan 298d3e31ab Merge branch 'master' into develop 2020-01-31 19:15:10 +08:00
hjxilinx c303ff2ab9 refactor some codes [tbase-266] 2020-01-31 15:37:32 +08:00
slguan 8828c9145c fix some compile errors 2020-01-31 12:12:01 +08:00
slguan c4d3d93a49
Merge pull request #1167 from taosdata/feature/lihui
[#1165]
2020-01-31 12:10:48 +08:00
plum-lihui 04551823a2
Merge pull request #1168 from taosdata/feature/slguan
TBASE-1452  #1136
2020-01-31 12:08:10 +08:00
slguan 04a759d797 Merge branch 'beta/v1.6.5.3'
# Conflicts:
#	src/client/src/tscServer.c
#	src/util/src/version.c
2020-01-31 12:00:27 +08:00
slguan d4d757c3d0 TBASE-1452 #1136 2020-01-31 11:51:52 +08:00
hjxilinx 8c2766e3e6 support the sliding query [tbase-266] 2020-01-30 15:55:09 +08:00
hjxilinx c6b0d6b0f9 support the sliding query [tbase-266] 2020-01-29 15:29:54 +08:00
lihui ffe1cbcfbf [#1165] 2020-01-21 15:31:30 +08:00
hjxilinx f726178075 support order for super table projection query. #1166. [tbase-1477] 2020-01-21 15:15:43 +08:00
hjxilinx 29df3ea39b support order for super table projection query. #1166. [tbase-1477] 2020-01-21 14:11:05 +08:00
slguan 64337a45ba
Merge pull request #1159 from taosdata/feature/subscribe
subscription
2020-01-20 10:27:44 +08:00
slguan 3d98546d0c
Merge pull request #1160 from taosdata/beta/v1.6.5.3
fix memory leaks
2020-01-20 10:23:39 +08:00
slguan cb17241f2b
Merge pull request #1161 from taosdata/feature/importSampleData
add importSampleData link
2020-01-20 10:22:42 +08:00
hjxilinx 44acd0ee9f merge develop branch 2020-01-19 17:53:26 +08:00
hjxilinx 4bf606a582 add order by ts support for super table query 2020-01-19 17:10:22 +08:00
lihui 5ebd8a1b3b [pSql->index] 2020-01-19 11:05:23 +08:00
hjxilinx 7a6a715f9a projection query on super table, filter the order request 2020-01-19 10:27:50 +08:00
xieyinglin d2b71b378c add importSampleData link 2020-01-18 19:01:51 +08:00
hjxilinx c4d61438ca fix memory leaks 2020-01-18 18:23:56 +08:00
localvar 8da35ff159 subscribe: update python connector documentation. 2020-01-18 16:48:04 +08:00
localvar 1f7a9e6764 subscribe: minor improvement
revise progress persistent file format to reduce file size.
example: print out number of rows consumed
2020-01-18 16:16:49 +08:00
plum-lihui de19fbfc13
Merge pull request #1156 from taosdata/beta/v1.6.5.3
fix bugs of releasing qhandle
2020-01-18 15:53:20 +08:00
plum-lihui ef3abeb7b9
Merge pull request #1153 from taosdata/hjxilinx-patch-2
Update TAOS SQL-ch.md
2020-01-18 15:52:53 +08:00
Bomin Zhang 66bcda4f7e
Merge pull request #1158 from taosdata/feature/lihui
Feature/lihui
2020-01-18 15:49:27 +08:00
lihui d9a041793f [TBASE-1490] 2020-01-18 15:44:05 +08:00
lihui f27c1b12fb [TBASE-1490] 2020-01-18 15:42:53 +08:00
localvar 35976735df subscribe: fix bug in multi-vnode subscription 2020-01-18 14:43:29 +08:00
Bomin Zhang d6e374465d
Merge pull request #1157 from taosdata/feature/lihui
[TBASE-1490]
2020-01-18 14:40:35 +08:00
lihui 32f8dca858 [TBASE-1490] 2020-01-18 14:32:26 +08:00
hjxilinx bde973221f fix bugs of releasing qhandle 2020-01-18 14:29:05 +08:00
hjxilinx 18755a1453 merge from develop 2020-01-18 10:33:49 +08:00
haojun Liao d566ed985d
Merge pull request #1155 from taosdata/beta/v1.6.5.3
Beta/v1.6.5.3
2020-01-18 10:27:05 +08:00
hjxilinx 59bb8b3c90 Merge remote-tracking branch 'origin/beta/v1.6.5.3' into beta/v1.6.5.3 2020-01-18 10:24:32 +08:00
hjxilinx e12f765b8f fix the bug of deref the qhandle 2020-01-18 10:24:07 +08:00
hjxilinx 556fb54d8d refactor some codes 2020-01-18 10:10:33 +08:00
Hongze Cheng 69c95d0d75 Fix dump memory leak 2020-01-17 22:56:18 +08:00
hjxilinx 84a70d8a0e refactor some codes 2020-01-17 22:31:01 +08:00
Bomin Zhang 785874301d
Merge pull request #1151 from taosdata/feature/lihui
[TBASE-1357]
2020-01-17 18:39:43 +08:00
Bomin Zhang 62d3c43f17
Merge pull request #1150 from taosdata/release/v1.6.4.6
[update release info]
2020-01-17 18:39:06 +08:00
plum-lihui 09e5527ecf
Merge pull request #1154 from taosdata/patch/python-doc
fix #1134
2020-01-17 18:37:53 +08:00
localvar 1177110a02 fix #1134 2020-01-17 18:34:56 +08:00