Commit Graph

27626 Commits

Author SHA1 Message Date
hzcheng 497300f1eb Fix meta problem 2020-03-27 10:41:53 +08:00
hzcheng fa19677ae6 Merge branch 'feature/2.0tsdb' of github.com:taosdata/TDengine into feature/2.0tsdb 2020-03-27 10:22:55 +08:00
hzcheng cc543aaf50 TD-34 2020-03-27 10:21:47 +08:00
hzcheng 0d8cc7972f TD-34 2020-03-27 10:21:47 +08:00
hzcheng 492ff11f5a TD-34 2020-03-27 10:21:47 +08:00
hzcheng b01e8b8d11 TD-34 2020-03-27 10:21:47 +08:00
hzcheng 1579f285ce
Merge pull request #1431 from taosdata/liaohj_2
[TD-32] fix error in retrieve data
2020-03-27 09:58:58 +08:00
hjxilinx c269b6d474 [TD-32] fix error in retrieve data 2020-03-27 01:59:26 +08:00
slguan 9961bf3332 [TD-16] change account codes 2020-03-27 00:38:00 +08:00
slguan 7c89da9864 [TD-16] 2020-03-27 00:27:38 +08:00
slguan 0d4852ca0e [TD-58] 2020-03-27 00:26:08 +08:00
slguan 3a4a91a053 remove unsed files 2020-03-27 00:18:47 +08:00
hzcheng 240a201b9a TD-34 2020-03-26 23:26:48 +08:00
slguan df32eea8e7
Merge pull request #1423 from taosdata/liaohj_2
[TD-32] fix error in retrieve data from table created according to st…
2020-03-26 14:29:14 +08:00
hjxilinx f629aee1c7 [TD-32] fix error in retrieve data from table created according to stable 2020-03-26 14:15:15 +08:00
haojun Liao a49528de6f
Merge pull request #1420 from taosdata/refact/slguan
[TD-15] fix error while create child table
2020-03-26 12:10:46 +08:00
slguan 021d4b4240 [TD-9] error while create child table 2020-03-26 12:09:22 +08:00
slguan 6e70d2371d Merge branch '2.0' into refact/slguan 2020-03-26 11:52:31 +08:00
slguan 6d8641f387
Merge pull request #1422 from taosdata/liaohj_2
Liaohj 2
2020-03-26 11:51:26 +08:00
hjxilinx aa77115ff6 [TD-32] 2020-03-26 11:34:03 +08:00
slguan 6f65c5a961 [TD-9] error while get metadata 2020-03-26 11:22:06 +08:00
hjxilinx c0e31d6c23 [td-32] fix bugs in projection query 2020-03-26 10:34:56 +08:00
slguan 66de5c58c9 [TD-9] fix crash while create table 2020-03-26 10:09:19 +08:00
slguan b6313b346f [TD-9] fix compile errors 2020-03-26 01:01:52 +08:00
slguan 2180f6eb0f [TD-9] merge normal table with child table 2020-03-26 00:20:40 +08:00
hzcheng 81f27c37a6 TD-34 2020-03-25 23:23:37 +08:00
hzcheng 002e414caf TD-34 2020-03-25 22:49:54 +08:00
hzcheng 7e5b12f7d5 TD-34 2020-03-25 18:00:18 +08:00
hjxilinx f743478363 [td-32]use code to denote if query is killed or not 2020-03-25 14:19:00 +08:00
slguan e1fdc40fe2 [TD-15] fix error while create child table 2020-03-25 11:01:07 +08:00
hzcheng 922134aabb
Merge pull request #1416 from taosdata/refact/slguan
Refact/slguan
2020-03-25 09:32:08 +08:00
slguan 1a048a1028 [TD-9] extract table name 2020-03-25 00:04:58 +08:00
slguan 1a52be002f [TD-9] update show tables’ tableId len 2020-03-24 23:54:22 +08:00
slguan db3bea8f38 [TD-10] fix memery corrupt after tqueue changed 2020-03-24 23:13:02 +08:00
hjxilinx 737d4c1072 [td-32] suppress warnings 2020-03-24 23:01:06 +08:00
hjxilinx c2a3c50f07 [td-32] fix memory leaks, and fix bugs in select * query. 2020-03-24 22:59:00 +08:00
slguan 2cf04d23b3 [TD-10] fix compile error in dnode 2020-03-24 19:30:45 +08:00
slguan 355eeda494 Merge branch '2.0' into refact/slguan
# Conflicts:
#	src/dnode/src/dnodeRead.c
2020-03-24 19:03:40 +08:00
slguan fd5cc4b5e2
Merge pull request #1415 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-03-24 19:00:27 +08:00
hzcheng 316609d9db Merge branch '2.0' into feature/2.0tsdb 2020-03-24 18:31:16 +08:00
hzcheng 377517eec4 TD-34 2020-03-24 18:30:25 +08:00
slguan 95ecbabce5
Merge pull request #1413 from taosdata/liaohj_2
Liaohj 2
2020-03-24 18:27:02 +08:00
hzcheng e0863b4c0b TD-34 2020-03-24 17:48:29 +08:00
hjxilinx b4e4e5a50b [td-32] fix bugs and refactor codes 2020-03-24 16:18:43 +08:00
hjxilinx dfc9531fdf Merge branch '2.0' into liaohj_2 2020-03-24 16:15:22 +08:00
hjxilinx de5fb15206 [td-32] fix bugs and refactor codes 2020-03-24 16:13:11 +08:00
slguan fa9a4099a1 Merge branch 'refact/sync' into refact/slguan 2020-03-24 15:54:01 +08:00
hzcheng 7317b29027
Merge pull request #1412 from taosdata/refact/slguan
Refact/slguan
2020-03-24 15:50:46 +08:00
slguan 930f4f169a Merge branch '2.0' into refact/slguan 2020-03-24 15:39:52 +08:00
slguan a863cd8675
Merge pull request #1411 from taosdata/liaohj_2
Liaohj 2
2020-03-24 15:39:23 +08:00