Commit Graph

27626 Commits

Author SHA1 Message Date
lihui b6c6d40778 [modify for arm] 2019-11-20 16:48:49 +08:00
Hongze Cheng 4c016f40ea Merge branch 'develop' into feature/mergeimport 2019-11-20 16:14:37 +08:00
hjxilinx a900d4a2f4 Merge branch 'develop' into feature/liaohj 2019-11-20 14:27:44 +08:00
hjxilinx 2830f322d4 [tbase-1203] 2019-11-20 14:19:23 +08:00
slguan d320f26135 [TBASE-1128] 2019-11-20 14:17:35 +08:00
haojun Liao d5433a8172
Merge pull request #750 from malongcn/develop
时间维度聚合的实例中 group by和fill 顺序写反了
2019-11-20 13:50:40 +08:00
malong b1dbc7c69a “超级表管理”的说明“2.TAGS列的数据类型不能是timestamp和nchar类型表述有问题;已经支持nchar了,去掉nchar 2019-11-20 13:48:49 +08:00
malong e7f473fcf4 什么是超级表 事例中的where条件字段写错了,name应该改为location 2019-11-20 13:44:26 +08:00
slguan 007997afd4
Merge pull request #749 from taosdata/feature/lihui
[TBASE-1198]
2019-11-20 13:35:03 +08:00
malong 7e52ceba89 时间维度聚合的语法 group by和fill 顺序写反了 2019-11-20 13:34:39 +08:00
lihui 3980d488e3 [TBASE-1199] 2019-11-20 13:27:28 +08:00
malong 403bc1b56b 时间维度聚合的实例中 group by和fill 顺序写反了 2019-11-20 13:20:13 +08:00
lihui 1895b2ff98 [TBASE-1198] 2019-11-20 11:55:11 +08:00
slguan 0eeae78538 [TBASE-1128] 2019-11-20 11:44:09 +08:00
slguan 6ee84b2dc4
Merge pull request #747 from taosdata/hotfix/#745
fix for issue #745
2019-11-20 10:44:06 +08:00
slguan b7e29f0e3d
Merge pull request #748 from taosdata/feature/liaohj
[TBASE-1197]fix memory realloc bug
2019-11-20 10:42:14 +08:00
hjxilinx 85bdad282b [TBASE-1197]fix memory realloc bug 2019-11-20 10:34:05 +08:00
localvar e7bdf0c25e support other alloc mode 2019-11-20 01:49:02 +00:00
localvar fc6737ab04 add option 'autoDump' for memory leak detection. 2019-11-20 01:46:24 +00:00
localvar 32abecfbc0 make 'taos_dump_memory_leak' public for java 2019-11-20 01:46:24 +00:00
localvar a5bfb0d670 update jni for memory leak detection 2019-11-20 01:46:24 +00:00
localvar dcfbbe8a58 implement memory leak detection 2019-11-20 01:46:24 +00:00
Hongze Cheng f60eb20ee7 Merge branch 'develop' into feature/mergeimport 2019-11-20 09:39:34 +08:00
xieyinglin ec86e48bcc fix for issue #745 2019-11-19 23:46:41 +08:00
plum-lihui f7e40d0e02
Merge pull request #746 from taosdata/feature/slguan
Fix crashes and other exceptions that may occur when deleting a database
2019-11-19 16:39:56 +08:00
slguan eb6be38711 remove some un necessary logs 2019-11-19 14:53:25 +08:00
slguan 5506dbe136 Merge branch 'develop' into feature/slguan 2019-11-19 14:24:25 +08:00
slguan d0a3a288a2 [TBASE-1186] 2019-11-19 14:23:47 +08:00
hzcheng a7b8c71ae3
Merge pull request #743 from taosdata/hotfix/#742
fix #742
2019-11-19 10:59:37 +08:00
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