groot f32cba6111

Merge strategy (#2277) ...

* merge manager

Signed-off-by: yhmo <yihua.mo@zilliz.com>

* fix build error

Signed-off-by: groot <yihua.mo@zilliz.com>

* layered merge strategy

Signed-off-by: groot <yihua.mo@zilliz.com>

* fix ut

Signed-off-by: groot <yihua.mo@zilliz.com>

* use simple

Signed-off-by: groot <yihua.mo@zilliz.com>

* fix parallel multi collections query crashissue

Signed-off-by: groot <yihua.mo@zilliz.com>

2020-05-11 01:38:50 +00:00

..

db

Add attributes to mysql and wal (#2229)

2020-05-07 06:14:58 +00:00

metrics

rename table to collection (#1888)

2020-04-10 19:17:33 +08:00

scheduler

rename optimizer to selector (#2067)

2020-04-24 11:42:17 +00:00

server

Fix show partitions failed in http module (fix #2228) (#2234)

2020-05-10 12:49:26 +00:00

storage

Caiyd 1881 bad alloc (#1892)

2020-04-09 17:13:15 +08:00

thirdparty

Delete and WAL feature branch merge (#1436)

2020-02-29 16:11:31 +08:00

CMakeLists.txt

Merge strategy (#2277)

2020-05-11 01:38:50 +00:00

main.cpp

#1240 Update license declaration of each file (#1241)

2020-02-17 23:40:58 +08:00