Commit Graph

230 Commits

Author SHA1 Message Date
hjxilinx 35a534ec9a add the union support in sql parser: fix some bugs. #1032. [TBASE-1140] 2020-01-03 18:30:24 +08:00
hjxilinx c18b6b1ba4 add the union support in sql parser. #1032. [TBASE-1140] 2019-12-30 11:18:16 +08:00
slguan ef6df5093d
Merge pull request #933 from taosdata/feature/liaohj
Feature/liaohj
2019-12-17 15:22:05 +08:00
hjxilinx 05ce45e76e fix the bugs in issue #932. [tbase-1353] 2019-12-17 13:46:31 +08:00
slguan f8453c14db
Merge branch 'develop' into hotfix/TBASE-1241 2019-12-11 22:32:08 +08:00
slguan 7d6db536d0 [TBASE-1241] 2019-12-11 16:19:44 +08:00
slguan 04b5df6273 [TBASE-1241] 2019-12-11 15:12:17 +08:00
slguan d774aa3993 [TBASE-1241] 2019-12-11 14:39:48 +08:00
slguan 2bf71e7107 [TBASE-1241] 2019-12-10 13:00:00 +08:00
hjxilinx 2ab2e2831e suppress some compile warnings 2019-12-09 23:23:05 +08:00
hjxilinx c12fb22e0a suppress compile warnings 2019-12-09 02:09:17 +08:00
slguan 964b643bc8 [TBASE-1296] 2019-12-07 18:04:36 +08:00
hjxilinx f0b93abbde [tbase-874] 2019-11-27 18:47:59 +08:00
slguan 903b88a5e1
Merge pull request #777 from taosdata/feature/lihui
[TBASE-570]
2019-11-26 22:53:05 +08:00
lihui f73aaccb57 [TBASE-570] 2019-11-26 18:30:40 +08:00
hjxilinx fbe9b5f852 [tbase-933] 2019-11-26 14:30:36 +08:00
slguan 1414e2ee10 [TBASE-1221] 2019-11-23 09:44:37 +08:00
slguan 104455dc8c Merge remote-tracking branch 'origin/develop' into feature/slguan 2019-11-22 19:25:15 +08:00
slguan ada94e72d2 [TBASE-1128] 2019-11-22 19:23:49 +08:00
lihui aeb19d1eb0 [TBASE-1215] 2019-11-21 19:24:06 +08:00
lihui 3980d488e3 [TBASE-1199] 2019-11-20 13:27:28 +08:00
hjxilinx de2ef67b06 [TBASE-1165] 2019-11-16 10:35:12 +08:00
hjxilinx 3313155271 [TBASE-814] 2019-11-15 11:00:37 +08:00
hjxilinx cf1ae56ebb [TBASE-1112], and refactor some code. 2019-11-13 11:28:38 +08:00
slguan c2e91fcb75 Adjust code structure 2019-11-07 18:12:26 +08:00
hjxilinx 25ff54c90c impose uid check for submit blocks, refer to #606 2019-10-11 10:58:06 +08:00
slguan 06b7af06a2 fix the issue #404 2019-08-23 09:58:08 +08:00
slguan 8b05ac9960 fix issue #212 2019-08-07 23:16:50 +08:00
slguan 6788a4222c Fix the issue ##110, unsorted timestamp in one request may cause crash 2019-07-20 17:17:10 +08:00
hzcheng 57492cc12d TDengine first commit 2019-07-11 16:36:16 +08:00