159 Commits

Author SHA1 Message Date
jinhai
504965412d Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-619 Add optimizer class in scheduler

See merge request megasearch/milvus!665

Former-commit-id: a5d1396a4d4b59de286c0a01e87be091aae17eee
2019-10-08 19:59:45 +08:00
wxyu
56d7c1523d MS-619 Add optimizer class in scheduler
Former-commit-id: d0f8950c8ca6e823df307a324d3bd56828b80801
2019-10-08 19:58:37 +08:00
jinhai
5e64d845e9 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
refine code

See merge request megasearch/milvus!664

Former-commit-id: ab4a168e0464af06b0dd9f989bc4ee207f237e38
2019-10-08 16:28:07 +08:00
jinhai
bfb09cb4fa Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-611 Add resources validity check in ResourceMgr

See merge request megasearch/milvus!663

Former-commit-id: 23765cd27ce07bd0f74373800ffb9e91c9293a67
2019-10-08 16:27:46 +08:00
starlord
1040298ec0 refine code
Former-commit-id: 5303054b0769e7f03a16ede2ff42f7068663b889
2019-10-08 15:44:03 +08:00
wxyu
d0e7744abc MS-611 Add resources validity check in ResourceMgr
Former-commit-id: cc00283529c2e56ee9829c2f42d7c217d1ba3f42
2019-10-08 15:24:50 +08:00
wxyu
0d3da0b841 MS-611 Add resources validity check in ResourceMgr
Former-commit-id: 0957d8980a07a07434bc2bea3ecff686a56cb127
2019-10-08 15:03:16 +08:00
jinhai
e62a7b3626 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-611 Add resources validity check in ResourceMgr

See merge request megasearch/milvus!662

Former-commit-id: bd4b9327b9fbd101e6811f6002f4dae4ff105f05
2019-10-08 14:49:04 +08:00
wxyu
6d0a2489c0 MS-611 Add resources validity check in ResourceMgr
Former-commit-id: 8732bacae82613066c415d4e22db256f9b8056d2
2019-10-08 14:48:11 +08:00
jinhai
3948c84c02 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-606 speed up result reduce

See merge request megasearch/milvus!661

Former-commit-id: 8dcea1323c9ef97803bb2e94fcfc56431b37f3bf
2019-10-08 14:35:52 +08:00
yudong.cai
e9e263fdb7 MS-606 speed up result reduce
Former-commit-id: 775557c15789b01d63d149ae495653af3cdaca38
2019-10-08 14:34:17 +08:00
jinhai
dc72f1dd59 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-610 Change error code base value from hex to decimal

See merge request megasearch/milvus!660

Former-commit-id: de9a27e7644bbb8416bad57ad87a86e41f98c36c
2019-10-08 11:53:29 +08:00
wxyu
e27e6741d3 MS-611 Add resources validity check in ResourceMgr
Former-commit-id: 55900459b4b25b27328b1ef85540f423742e70a3
2019-10-08 11:52:30 +08:00
starlord
0b2bd8d5ab MS-610 Change error code base value from hex to decimal
Former-commit-id: 4b12f9998a2490a2b059514301f67883d5e730f4
2019-10-08 11:52:05 +08:00
wxyu
14d9af54a3 MS-609 Update task construct function
Former-commit-id: f187500ad365a90ae751b6fd4efa7f8b10e2f6c4
2019-10-07 19:01:56 +08:00
wxyu
3ad2b8d74c MS-608 Update TODO names
Former-commit-id: 6a3cabeef62feb3c3125bc5e9a9b2c4f6eb20d7c
2019-10-07 15:29:56 +08:00
jinhai
6fe1fb9a11 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-602 Remove zilliz namespace

See merge request megasearch/milvus!651

Former-commit-id: a24e2508be51603e17447cbd7d91689fdba64299
2019-09-29 16:39:49 +08:00
starlord
aa1be9cd16 Remove zilliz namespace
Former-commit-id: 18ae9b5711cabd59baf7e0784583f99a655bf9c2
2019-09-29 16:37:34 +08:00
wxyu
26a6bb6b87 MS-599 search wrong result when table created with metric_type: IP
Former-commit-id: 7dd107fa0126919ba7948cc0bacb6b1426f2d7c8
2019-09-29 15:05:00 +08:00
starlord
d1251fb0c1 format code by clang-tidy
Former-commit-id: 437b1fff79da965b8aafce026c8be4f9d582c909
2019-09-28 15:00:26 +08:00
starlord
aabd91a156 format code by clang-tidy
Former-commit-id: f9e606566555ad381b8e95e1a4e2572fc61678f0
2019-09-28 12:36:14 +08:00
starlord
58b82398cc format code by clang-format
Former-commit-id: c817c67a409054a49da2be878872e885a0b3e041
2019-09-28 10:28:51 +08:00
JinHai-CN
88ced5a751 MS-595 Fix compiling error on gcc 7.4
Former-commit-id: 2d408646efb2d8bbc48803a8d39be8570751778e
2019-09-27 15:51:48 +08:00
starlord
965ca2c9c1 format scheduler code
Former-commit-id: c2ff1ac702af62b4968a192d12b258bc90dd0b50
2019-09-27 11:50:01 +08:00
yudong.cai
44b539728c Merge branch 'branch-0.5.0' into caiyd_refactor_config_1
Former-commit-id: 28ba312753b541b8fde198345943f974cfb6a452
2019-09-25 20:09:40 +08:00
yudong.cai
0d0d08c256 MS-574 let all config APIs return Status
Former-commit-id: 7a843fa57779637761a80def4705a37f9805ceaf
2019-09-25 16:16:08 +08:00
yudong.cai
ebda6cb4ef MS-574 rename ServerConfig to Config
Former-commit-id: 2b0ef94293017c64a2f17616a3089e7f0cdd6b2b
2019-09-21 16:39:48 +08:00
yudong.cai
22563d83d7 MS-574 add GET config APIs
Former-commit-id: 6011f32d650d26367ab84f4bf8521889881f2629
2019-09-21 15:02:35 +08:00
wxyu
d64389c7e3 MS-585 Update namespace in scheduler
Former-commit-id: 073ab3c91a97415efcb7d3be516a6bc00ee07a7a
2019-09-21 11:29:04 +08:00
Yu Kun
cfc42c5471 MS-576 Scheduler refactor
Former-commit-id: dc9317412c5dc72191381d5a634e7e9ff14f98b2
2019-09-20 18:02:08 +08:00
yudong.cai
82e37e11ba MS-574 uniform config name format, add config default value
Former-commit-id: 2d11027d4b70632e22b3100fb2bde91c86972969
2019-09-20 17:08:26 +08:00
xiaojun.lin
8776ea6e8d Merge branch 'branch-0.5.0' into refactor_knowhere
Former-commit-id: 1b4cc493702639b7e3e2f0f2e504ac34b951430e
2019-09-19 19:09:54 +08:00
xiaojun.lin
b282580bf9 MS-565 rename knowhere files
Former-commit-id: a7c2a8b1d99e6cf29bbcaf27b131e0ce5bd42f43
2019-09-19 19:01:26 +08:00
wxyu
75ea4c4add MS-577 Unittest Query randomly hung
Former-commit-id: 5e4365deea822861077f41cda17d3cbd8504f327
2019-09-19 17:28:15 +08:00
wxyu
e72b0348f7 MS-555 Remove old scheduler
Former-commit-id: 8eb7f773a15df78f46bf61a59ec0ea9d8923cc28
2019-09-18 19:44:38 +08:00
wxyu
5a2743946b MS-562 Add JobMgr and TaskCreator in Scheduler
Former-commit-id: bbaf2b649843e86fc7bbd28ec61e5a990fc5951f
2019-09-18 10:42:01 +08:00
starlord
5f07962cd4 MS-557 merge Log.h
Former-commit-id: 37a1aece83b0885aef1ad60fbd3b26805df57a54
2019-09-17 11:07:39 +08:00
starlord
b77155f3ec merge Log.h
Former-commit-id: 3de21b82b857b7601075b977792ffdd36638e800
2019-09-17 11:05:09 +08:00
wxyu
909e2a0934 add Apache License
Former-commit-id: 8afccd9400189249b2f0c797e6e0f53f74547246
2019-09-17 10:59:51 +08:00
wxyu
6cbf62c35f Merge remote-tracking branch 'main/branch-0.5.0' into branch-0.5.0
Former-commit-id: 3b0b477ac496700e63f0ecf51fed63d100f2bd24
2019-09-17 10:58:01 +08:00
starlord
63bd4cca5c merge Log.h
Former-commit-id: 1204cfbfddee0b863abf10874ef97f0581c36a9a
2019-09-17 10:57:41 +08:00
wxyu
af9c167ed0 MS-556 Add Job Definition in Scheduler
Former-commit-id: 87787757226f3b397d65125a687442222a5d3532
2019-09-17 10:54:51 +08:00
jinhai
9433bf81cc MS-554 Change license to apache 2.0
Former-commit-id: e09b7dd7872372fa0ece9f5d18ec4c316b89cbe8
2019-09-17 10:51:48 +08:00
jinhai
73ee2e0a7b Update lockguard
Former-commit-id: 1bdcd84679433929e582689661730f1359077c98
2019-09-12 17:58:18 +08:00
jinhai
8c9bbc4467 Fix compile error
Former-commit-id: 2fb38500e2c534d1ddfeca123675c2f425efb2a4
2019-09-12 09:29:09 +00:00
jinhai
bf9e1d7073 Merge branch 'branch-1.4.0' of http://192.168.1.105:6060/jinhai/milvus into branch-0.4.0
Former-commit-id: aa587bd63672ba5bec583eba3f4737142af02f0d
2019-09-12 09:13:18 +00:00
jinhai
ca53a98c55 Add merge mutex
Former-commit-id: 3e65e9a3195ec1eff635b17997b599dbca1a0457
2019-09-12 17:11:02 +08:00
peng.xu
da99a9e1f0 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
fix build index error

See merge request megasearch/milvus!562

Former-commit-id: 3f42a54ffa04c2f8c53ff6228e982fac8281b4fd
2019-09-12 16:23:44 +08:00
starlord
193d0eeb6d fix build index error
Former-commit-id: 593aeb2482792bfef55fbec8e6480df498cf9708
2019-09-12 16:22:21 +08:00
yudong.cai
f136df4aaa MS-543 send error status to sdk when load index fail
Former-commit-id: a62922b904c7f7d478f5211b4d215d387ea23ae2
2019-09-12 14:10:56 +08:00