Commit Graph

10447 Commits

Author SHA1 Message Date
Jeff Tao 1f953a0f63 fix #742
unCommittedBlocks shall be decreased by one
2019-11-19 10:36:39 +08:00
Jeff Tao 78158e32a5 fix #742 2019-11-19 10:31:53 +08:00
hzcheng 1f2465982a
Merge pull request #744 from taosdata/jtao1735-patch-1
add number list for the super table example
2019-11-18 21:57:14 +08:00
Jeff Tao fa3f34dcda
Update Super Table-ch.md 2019-11-18 21:53:20 +08:00
slguan 54e7aef8e6 [TBASE-1186] 2019-11-18 21:50:05 +08:00
Jeff Tao d731fc0dbf fix #742 2019-11-18 21:36:53 +08:00
slguan 6b77a4e11f Merge branch 'develop' into release/v1.6.4.0 2019-11-18 17:45:11 +08:00
slguan 8527587b49 [TBASE-1186] 2019-11-18 17:44:36 +08:00
slguan dbb888c117
Merge pull request #740 from taosdata/feature/bmzhang
fix TBASE-1176
2019-11-18 16:33:49 +08:00
localvar d458545cce fix TBASE-1176 2019-11-18 06:29:11 +00:00
fangpanpan 6240637a39
Merge pull request #739 from taosdata/feature/lihui
[TBASE-1123]
2019-11-18 14:14:27 +08:00
lihui 3fe4650924 [TBASE-1123] 2019-11-18 13:52:46 +08:00
fangpanpan 60032c4ccd
Merge pull request #737 from taosdata/feature/lihui
[TBASE-1123]
2019-11-18 12:11:42 +08:00
lihui f2cbef3fe1 [TBASE-1123] 2019-11-18 11:35:34 +08:00
plum-lihui b1bb894e63
Merge pull request #734 from taosdata/feature/slguan
Feature/slguan
2019-11-16 17:08:20 +08:00
slguan 5e48daf58f Merge branch 'develop' into feature/slguan 2019-11-16 16:56:14 +08:00
slguan 8c55d4860a [TBASE-1164] 2019-11-16 16:55:41 +08:00
slguan 7aeacaf67f
Merge pull request #733 from taosdata/feature/liaohj
Feature/liaohj
2019-11-16 15:44:11 +08:00
slguan a702f5efc0
Merge pull request #732 from taosdata/hotfix/many_files
add an assert for debug purpose
2019-11-16 15:42:19 +08:00
hjxilinx c302d338e7 refactor code, reorganize the header files 2019-11-16 15:30:28 +08:00
slguan d146221608
Merge pull request #731 from taosdata/feature/lihui
Feature/lihui
2019-11-16 14:39:28 +08:00
Hongze Cheng 6e7b3cf17a add an assert for debug purpose 2019-11-16 14:36:54 +08:00
lihui 55ed99d78e [add taoserror.h] 2019-11-16 13:39:51 +08:00
lihui 1efed1e01b [add taoserror.h] 2019-11-16 13:37:05 +08:00
lihui edbf603ee4 [change return error result] 2019-11-16 13:35:46 +08:00
slguan 9c7fb6b00f [TBASE-1161] 2019-11-16 11:29:19 +08:00
hjxilinx 4156af7c0d Merge branch 'develop' into feature/liaohj 2019-11-16 10:43:47 +08:00
slguan b08e41ed35
Merge pull request #730 from taosdata/feature/liaohj
Feature/liaohj
2019-11-16 10:43:10 +08:00
hjxilinx 4e7e75b7ad 4] 2019-11-16 10:39:47 +08:00
hjxilinx de2ef67b06 [TBASE-1165] 2019-11-16 10:35:12 +08:00
slguan d276b59c43 Merge branch 'develop' into feature/slguan 2019-11-15 22:28:38 +08:00
slguan 6b4a9223a7 Merge branch 'feature/slguan' of https://github.com/taosdata/TDengine into feature/slguan 2019-11-15 22:28:19 +08:00
slguan 460bc57a30 In some cases, "mgmt node is gone“ error will occur 2019-11-15 22:28:03 +08:00
plum-lihui ea6ded66fe
Merge pull request #727 from taosdata/release/v1.6.3.1
Release/v1.6.3.1
2019-11-15 19:08:33 +08:00
plum-lihui 2107463984
Merge branch 'master' into release/v1.6.3.1 2019-11-15 19:08:17 +08:00
plum-lihui ac94df49f1
Merge pull request #728 from taosdata/feature/slguan
[TBASE-1155]
2019-11-15 19:04:40 +08:00
slguan 95955cb474 [TBASE-1155] 2019-11-15 19:01:01 +08:00
slguan 0d2eb1bf08 [TBASE-1155] 2019-11-15 18:44:00 +08:00
slguan 601ae0551c
Merge pull request #722 from malongcn/develop
按时间周期聚合查询 中 WHERE后面的name 改为 location
2019-11-15 18:02:22 +08:00
slguan 2ed9150616
Merge pull request #726 from taosdata/feature/liaohj
[tbase-1147]
2019-11-15 18:01:58 +08:00
slguan b3525504b5
Merge pull request #721 from taosdata/feature/tbase1020
[TBASE1020]
2019-11-15 18:01:40 +08:00
slguan 21c44ead65
Merge pull request #724 from taosdata/feature/tbase-814
[tbase-814]
2019-11-15 18:00:05 +08:00
hjxilinx 6246ec6add Merge branch 'develop' into feature/liaohj 2019-11-15 16:41:30 +08:00
hjxilinx ad3c52a806 [tbase-1147] 2019-11-15 16:29:18 +08:00
fangpanpan 29a98bbe61 [tbase-814] 2019-11-15 16:03:04 +08:00
malong 48c470e21c “超级表管理”的说明“2.TAGS列的数据类型不能是timestamp和nchar类型;描述错误,实际tags是支持nchar类型的 2019-11-15 15:47:34 +08:00
malong e42fff8bb7 此时可使用自动建表语法来实现写入数据时里用超级表定义的表结构自动创建不存在的子表 多了个‘里’字 2019-11-15 15:38:55 +08:00
malong a52ea6e614 使用类SQL语言用插入或查询数据 改为: 使用类SQL语言插入或查询数据 2019-11-15 15:22:39 +08:00
malong 5a09ffebb9 按时间周期聚合查询 中 WHERE后面的name 改为 location 2019-11-15 15:06:01 +08:00
slguan 683baa2899 [TBASE1020] 2019-11-15 11:59:36 +08:00