Commit Graph

2262 Commits

Author SHA1 Message Date
slguan 16f94e23dd Merge branch '2.0' into refact/slguan 2020-03-31 18:08:30 +08:00
slguan 8af78374aa [TD-17] 2020-03-31 18:07:57 +08:00
slguan 107518ee8c [TD-17] 2020-03-31 17:50:49 +08:00
haojun Liao 442cd55b2e
Merge pull request #1476 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-03-31 15:49:17 +08:00
hzcheng 01682c4da9 Merge branch '2.0' into feature/2.0tsdb 2020-03-31 14:57:31 +08:00
hzcheng 40dfd72695 TD-34 2020-03-31 14:56:12 +08:00
haojun Liao 5d2745f238
Merge pull request #1474 from taosdata/feature/2.0tsdb
TD-34
2020-03-31 12:03:11 +08:00
hzcheng 69f7437e52 TD-34 2020-03-31 11:46:18 +08:00
haojun Liao 64200763b9
Merge pull request #1473 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-03-31 10:23:19 +08:00
hzcheng 9742409330 Merge branch '2.0' into feature/2.0tsdb 2020-03-31 10:18:43 +08:00
hzcheng 4180cf9e51 TD-34 2020-03-31 10:17:05 +08:00
hzcheng 1108de0fe3
Merge pull request #1472 from taosdata/refact/slguan
Refact/slguan
2020-03-31 10:09:44 +08:00
slguan 5fb1dd5e3d [TD-73] 2020-03-31 00:47:17 +08:00
slguan 260856fb0f Merge remote-tracking branch 'origin/2.0' into refact/slguan 2020-03-31 00:38:26 +08:00
slguan 06921dd87a
Merge pull request #1442 from taosdata/refact/sync
fix the bug for code
2020-03-31 00:36:59 +08:00
slguan 3ead49acec Merge remote-tracking branch 'origin/2.0' into refact/slguan 2020-03-31 00:35:17 +08:00
slguan 16710ace8f [TD-73] add tsim program 2020-03-31 00:34:35 +08:00
hzcheng f2a36718e5 Merge branch '2.0' into feature/2.0tsdb 2020-03-30 22:54:46 +08:00
hzcheng 9fee498315 TD-34 2020-03-30 22:48:53 +08:00
hzcheng f079008dd0
Merge pull request #1470 from taosdata/refact/slguan
Refact/slguan
2020-03-30 18:32:53 +08:00
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