Commit Graph

2297 Commits

Author SHA1 Message Date
hzcheng 12d2e463eb TD-34 2020-03-28 18:58:51 +08:00
hzcheng 2b14e5524f TD-34 2020-03-28 18:07:56 +08:00
hzcheng 5470057dbc TD-34 2020-03-28 16:24:59 +08:00
Jeff Tao 92fa341fc5 add the code for synchronous client API 2020-03-28 15:45:17 +08:00
hzcheng d37876fe31 TD-34 2020-03-28 15:03:50 +08:00
hzcheng 016b5e8550 TD-34 2020-03-28 14:19:48 +08:00
hjxilinx e45701a667 [TD-32] fix bugs in super table query 2020-03-28 13:01:03 +08:00
hzcheng f29b0fcaf7 TD-34 2020-03-28 12:08:41 +08:00
hzcheng 632d1865ef Merge branch '2.0' into feature/2.0tsdb 2020-03-28 10:38:09 +08:00
hzcheng 0d468d4a8e
Merge pull request #1444 from taosdata/liaohj_2
[TD-32] support multi-table query
2020-03-28 10:37:09 +08:00
hzcheng db86ba92a6 Merge branch '2.0' into feature/2.0tsdb 2020-03-28 10:36:41 +08:00
hjxilinx ff14492181 [TD-32] support multi-table query 2020-03-28 10:34:51 +08:00
hzcheng db78012091
Merge pull request #1443 from taosdata/liaohj_2
[TD-32]add super table tag filter support at vnode side.
2020-03-28 10:33:08 +08:00
Jeff Tao 5e5f32b085 add the code to handle the broken link 2020-03-27 22:19:32 +08:00
Jeff Tao e485bb24b2 roll back the rserver.c 2020-03-27 21:39:11 +08:00
Jeff Tao 4c60448baf fix the bug for code
add the code to handle idle timer
2020-03-27 20:51:51 +08:00
hzcheng 7032405e95 TD-34 2020-03-27 20:19:34 +08:00
hjxilinx 6fae35afd0 [TD-32]add super table tag filter support at vnode side. 2020-03-27 17:55:54 +08:00
slguan 63f825a7e6 [TD-61] 2020-03-27 15:06:31 +08:00
slguan f1f30749e2 [TD-63] 2020-03-27 15:06:20 +08:00
haojun Liao f77c3a6938
Merge pull request #1434 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-03-27 11:30:27 +08:00
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