Commit Graph

2342 Commits

Author SHA1 Message Date
slguan 12ccad9df5 Merge branch '2.0' into refact/slguan 2020-03-30 18:20:43 +08:00
slguan 10485e3396 [TD-17] make cluster can be compiled 2020-03-30 18:18:05 +08:00
Jeff Tao 2f7fb6e115
Merge branch '2.0' into refact/sync 2020-03-30 18:02:20 +08:00
haojun Liao 6824687dc9
Merge pull request #1469 from taosdata/feature/2.0tsdb
TD-34
2020-03-30 17:32:00 +08:00
hzcheng bf9c67405d TD-34 2020-03-30 17:29:05 +08:00
slguan ecae31bbbf Merge branch '2.0' into refact/slguan
# Conflicts:
#	src/vnode/detail/src/vnodeUtil.c
2020-03-30 17:28:47 +08:00
slguan 86e4ebcd83 [TD-17] make cluster can be compiled 2020-03-30 17:27:01 +08:00
hzcheng 0009283520
Merge pull request #1468 from taosdata/liaohj_2
[TD-32] opt skiplist insertion performance for ordered data
2020-03-30 17:26:58 +08:00
hjxilinx f928765dc6 [TD-32] opt skiplist insertion performance for ordered data 2020-03-30 17:18:53 +08:00
haojun Liao 6dfca9283e
Merge pull request #1467 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-03-30 16:47:27 +08:00
hzcheng d8c7cdf1c9 TD-34 2020-03-30 16:44:56 +08:00
hzcheng 5e6ed4b486 Merge branch '2.0' into feature/2.0tsdb 2020-03-30 14:56:15 +08:00
hzcheng fd6c41ebcc
Merge pull request #1464 from taosdata/liaohj_2
Liaohj 2
2020-03-30 14:52:13 +08:00
hjxilinx 818b04e51e [TD-32] change the unit test cases. 2020-03-30 14:48:02 +08:00
hjxilinx 93ac480923 Merge branch '2.0' into liaohj_2 2020-03-30 14:46:51 +08:00
hjxilinx 18a63bd3f1 [TD-32] merge 2.0 branch 2020-03-30 14:43:01 +08:00
hzcheng 5b10eda698 TD-34 2020-03-30 14:26:38 +08:00
hzcheng c94331fc6b TD-34 2020-03-30 13:29:36 +08:00
slguan 57b73505dc
Merge pull request #1460 from taosdata/liaohj_2
Liaohj 2
2020-03-30 13:25:34 +08:00
Jeff Tao 7337f7593d add new API walGetWalFile 2020-03-30 12:13:09 +08:00
Jeff Tao 6b02bd2630 add API walGetWalFile for synchronization 2020-03-30 08:53:44 +08:00
Jeff Tao 87bf983d48 first draft for WAL 2020-03-29 23:28:06 +08:00
hjxilinx e6adb196e4 Merge branch '2.0' into liaohj_2 2020-03-29 22:15:44 +08:00
haojun Liao 0e377c5aa4
Merge pull request #1462 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-03-29 22:14:24 +08:00
hjxilinx db171b36e9 Merge branch '2.0' into liaohj_2 2020-03-29 22:00:48 +08:00
hzcheng c2a06454f5 Merge branch '2.0' into feature/2.0tsdb 2020-03-29 21:56:42 +08:00
hzcheng e29ee2a211 TD-34 2020-03-29 21:54:23 +08:00
haojun Liao 6c5929f33a
Merge pull request #1461 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-03-29 19:30:03 +08:00
hzcheng 8339f9c864 TD-34 2020-03-29 19:19:51 +08:00
slguan 86dc34fe16 [TD-63] finx link errors 2020-03-29 18:12:57 +08:00
slguan 0f331d2ddf [TD-58] change cmake files 2020-03-29 18:07:08 +08:00
slguan 306fde55fd [TD-63] [TD-61] change the interface of acct and grant 2020-03-29 17:45:40 +08:00
hzcheng d127890a1d Merge branch '2.0' into feature/2.0tsdb 2020-03-29 17:21:10 +08:00
hzcheng a944461d57 TD-34 2020-03-29 17:17:57 +08:00
hjxilinx 695b1a0fdc [TD-32] merge 2.0 branch 2020-03-29 17:00:23 +08:00
hjxilinx faabc36717 Merge branch '2.0' into liaohj_2 2020-03-29 16:59:23 +08:00
hjxilinx 1bf6d52355 [TD-32] fix bugs in check data in file block 2020-03-29 16:56:49 +08:00
hzcheng ab22c7f606 TD-34 2020-03-29 16:41:25 +08:00
slguan 113f164b9e
Merge pull request #1458 from taosdata/liaohj_2
Liaohj 2
2020-03-29 15:48:27 +08:00
hjxilinx 93e38711b1 Merge branch '2.0' into liaohj_2 2020-03-29 15:06:17 +08:00
haojun Liao a03a9c06e7
Merge pull request #1459 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-03-29 15:04:45 +08:00
hzcheng ffb02d974d TD-34 2020-03-29 15:01:00 +08:00
hjxilinx 393a816c24 [TD-32] add unit test 2020-03-29 14:14:51 +08:00
hzcheng f0bd200eb6 TD-34 2020-03-28 22:52:01 +08:00
hjxilinx 8ff864021b [TD-32] fix bugs in super table query. 2020-03-28 22:23:38 +08:00
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