Commit Graph

1553 Commits

Author SHA1 Message Date
slguan 2f7883b116 Merge branch '2.0' of https://github.com/taosdata/TDengine into 2.0 2020-02-05 16:08:09 +08:00
Hongze Cheng 2d6b50cd8d add TSDB initial interface files 2020-02-05 14:28:57 +08:00
slguan 457c557694 #1177 2020-02-05 09:34:02 +08:00
slguan 27fef6c1d5 Merge branch 'develop' into 2.0 2020-02-04 14:58:35 +08:00
slguan 90c23c39b7
Merge pull request #1182 from taosdata/feature/lihui
Feature/lihui
2020-02-04 14:54:46 +08:00
huili 9fec20a921 [add to compile aarch32] 2020-02-04 14:51:18 +08:00
huili 196cd0a31e [add to compile aarch32] 2020-02-04 14:49:33 +08:00
slguan ded5426498 #1177 2020-02-04 00:02:40 +08:00
slguan d128fc9b74 #1177 2020-02-03 22:21:21 +08:00
slguan 5c921ca8b5 Merge branch 'develop' into 2.0 2020-02-03 21:21:58 +08:00
slguan ea1723bd60 #1177 2020-02-03 21:21:31 +08:00
slguan dcdb04fbaa
Merge pull request #1178 from taosdata/feature/liaohj
Feature/liaohj
2020-02-03 21:15:24 +08:00
slguan 16a73dcb28
Merge pull request #1181 from taosdata/feature/#1180
Feature/#1180
2020-02-03 21:15:14 +08:00
slguan 69a5dcda7d
Merge branch 'develop' into feature/#1180 2020-02-03 21:14:55 +08:00
Hongze Cheng 26802eb7b7 add feature #1180 2020-02-03 17:38:02 +08:00
hjxilinx 9c1db2eff0 fix compile error 2020-02-03 16:17:42 +08:00
hjxilinx c8d03c01f6 merge dev branch 2020-02-03 15:21:01 +08:00
slguan 46408db8ff #1177 2020-02-03 12:22:28 +08:00
slguan f8ff709103
Merge pull request #1175 from taosdata/beta/v1.6.5.3
Beta/v1.6.5.3
2020-02-03 12:07:11 +08:00
hjxilinx 62f1491608 refactor some codes 2020-02-03 10:43:19 +08:00
slguan fdfcc4aaa5
Merge pull request #1173 from taosdata/beta/v1.6.5.3
Beta/v1.6.5.3
2020-02-03 09:59:49 +08:00
hjxilinx 5031ac2144 fix a memory leak for super table join. 2020-02-02 22:46:50 +08:00
hjxilinx c87c430515 fix a memory leak. 2020-02-02 13:51:49 +08:00
hjxilinx 2735c95624 fix a memory leak for null value projection in tags. 2020-02-01 23:13:54 +08:00
slguan 29fe60b2ca Merge branch 'develop' into feature/slguan 2020-02-01 15:57:13 +08:00
hjxilinx f4e29425fe fix a typo 2020-02-01 15:25:48 +08:00
hjxilinx 692ba8cca2 refactor some codes 2020-02-01 14:40:34 +08:00
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