520 Commits

Author SHA1 Message Date
starlord
1040298ec0 refine code
Former-commit-id: 5303054b0769e7f03a16ede2ff42f7068663b889
2019-10-08 15:44:03 +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
yudong.cai
e9e263fdb7 MS-606 speed up result reduce
Former-commit-id: 775557c15789b01d63d149ae495653af3cdaca38
2019-10-08 14:34:17 +08:00
wxyu
14d9af54a3 MS-609 Update task construct function
Former-commit-id: f187500ad365a90ae751b6fd4efa7f8b10e2f6c4
2019-10-07 19:01:56 +08:00
starlord
aa1be9cd16 Remove zilliz namespace
Former-commit-id: 18ae9b5711cabd59baf7e0784583f99a655bf9c2
2019-09-29 16:37:34 +08:00
starlord
715d823d0b MS-600 Reconstruct unittest code
Former-commit-id: e48bed725840b4044dc4cb647905972c193ebacd
2019-09-29 11:52:55 +08:00
starlord
d1251fb0c1 format code by clang-tidy
Former-commit-id: 437b1fff79da965b8aafce026c8be4f9d582c909
2019-09-28 15:00:26 +08:00
starlord
5220a39362 format unittest code
Former-commit-id: 876a54437b8d5150a2a3d2b4c16b4983783cef42
2019-09-27 19:07:02 +08:00
starlord
c93202258f format unittest code
Former-commit-id: f5979db268dc71e79ef556617fb8992dda04a422
2019-09-27 18:57:46 +08:00
xiaojun.lin
2652b3bcc4 Merge branch 'branch-0.5.0' into refactor_knowhere
Former-commit-id: 981b23f103df4dfdd5c4bcb571b2aad2d973de03
2019-09-27 15:50:04 +08:00
xiaojun.lin
180600fb24 MS-565 remove jsoncons v2
Former-commit-id: a37cbd9b67c66fca6e4ef08519e5f48248985c98
2019-09-27 15:41:20 +08:00
yudong.cai
85d3c9d052 MS-574 add API ResetDefaultConfig()
Former-commit-id: 475b048bb6386ffd3bb09a229694e954f8fc67e7
2019-09-27 11:25:13 +08:00
yudong.cai
3a6448b3e8 MS-574 update config unittest
Former-commit-id: f60c3ada442acea12827bcae136a29adbe6f9c2e
2019-09-27 10:37:07 +08:00
starlord
2a2a070c95 fix build error
Former-commit-id: 9b595c80931e17acf676f03e1f3b4cdcc9a40b94
2019-09-26 20:36:58 +08:00
Yu Kun
3ed012660a fix conflicts
Former-commit-id: b76eb04b7a5490d6ac28024f0367580b4fbb7e8a
2019-09-26 15:11:48 +08:00
starlord
9eb1ebc677 fix unittest build error
Former-commit-id: 2bacb09b54ef6e84a9594de5064dc87461d215fc
2019-09-26 12:23:47 +08:00
Heisenberg
e1cfb6cc06 MS-591 Rename source files in wrapper
Former-commit-id: 1b864ef00ccdc0e524c2cf7cceb97428171077f8
2019-09-26 11:27:27 +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
starlord
be2abf935c fix build error
Former-commit-id: f094a9ad816accc2b6fc96e2c515e554d9ce8f14
2019-09-25 14:15:26 +08:00
yudong.cai
ebda6cb4ef MS-574 rename ServerConfig to Config
Former-commit-id: 2b0ef94293017c64a2f17616a3089e7f0cdd6b2b
2019-09-21 16:39:48 +08:00
wxyu
d64389c7e3 MS-585 Update namespace in scheduler
Former-commit-id: 073ab3c91a97415efcb7d3be516a6bc00ee07a7a
2019-09-21 11:29:04 +08:00
starlord
1b4ce04c08 refine code
Former-commit-id: 8e2af64ed8fe7517069944eed3545d13398a3ed7
2019-09-20 19:29:06 +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
Heisenberg
72ffa6c4fd MS-583 Change to Status from errorcode
Former-commit-id: 63ba084d42e2fba75a581895cb3513666bff4329
2019-09-20 16:10:29 +08:00
starlord
24b8e393bf merge code
Former-commit-id: 213b4823192af7e340ac5a250c363d0a32a3c3aa
2019-09-20 11:53:04 +08:00
starlord
736ca8e473 MS-578 makesure milvus5.0 dont crack 0.3.1 data
Former-commit-id: 9f801246821d98c4f5d7681252b5dfadf1f94773
2019-09-20 11:33:10 +08:00
xiaojun.lin
4b91faa50c MS-565 split class version 1
Former-commit-id: 1a60045de13e055d4b0a7e9da389b7e377c141af
2019-09-19 21:21:38 +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
starlord
7e58704662 fix unittest hang issue
Former-commit-id: 1e6b431332c823fbbef29132eaaaaff86b8afe7e
2019-09-19 18:44:20 +08:00
starlord
44c382da83 refine code
Former-commit-id: 673cf5d86bf86f50cfdfa3576c3dbd20204487b9
2019-09-19 18:13:48 +08:00
starlord
6ed8251c3b fix unitest failed issue
Former-commit-id: b4f12f185be2a302c25fa04695966f49c2a446ed
2019-09-19 15:15:35 +08:00
wxyu
3c6f49f9cc MS-555 Remove old scheduler
Former-commit-id: e07f211e59232b04cfa3f37240e896461ad9b616
2019-09-18 19:52:23 +08:00
wxyu
e72b0348f7 MS-555 Remove old scheduler
Former-commit-id: 8eb7f773a15df78f46bf61a59ec0ea9d8923cc28
2019-09-18 19:44:38 +08:00
zhiru
666c6003f4 update
Former-commit-id: 1a3242b1ac87cad3274cc28d2e73697e55936e8b
2019-09-18 19:00:40 +08:00
xiaojun.lin
59ea536db6 MS-565 1. del wrapper/knowhere
Former-commit-id: 3905da5c0716c6fe8317588c27a61b4a5c36316e
2019-09-18 17:36:47 +08:00
zhiru
a5b3dea158 update
Former-commit-id: 3d3617149b664de4d6af554af6e984163b963fe6
2019-09-18 17:30:05 +08:00
zhiru
b364c8e3a7 update
Former-commit-id: 034185feb37416994a52ddf14a30daa06c886f14
2019-09-18 15:51:17 +08:00
zhiru
8464b8a206 refactor cmake
Former-commit-id: 587cc22f501fd12cbdaf2d9950fce3f2483c7020
2019-09-18 15:49:47 +08:00
starlord
8eaf03a279 refine code
Former-commit-id: 710c122428d52f56a7bf41903afa4a7f8c6db01e
2019-09-18 15:05:51 +08:00
starlord
69ce92dcc5 MS-558 refine status code
Former-commit-id: ebb5ec55a58cfce4385f39d186e86d858eab1bf0
2019-09-18 12:49:29 +08:00
starlord
e16ac72a25 MS-558 refine status code
Former-commit-id: cb176cf273ec66e1f7f5e89e9ba4c39cabc511ea
2019-09-17 17:37:31 +08:00
starlord
b77155f3ec merge Log.h
Former-commit-id: 3de21b82b857b7601075b977792ffdd36638e800
2019-09-17 11:05:09 +08:00
starlord
63bd4cca5c merge Log.h
Former-commit-id: 1204cfbfddee0b863abf10874ef97f0581c36a9a
2019-09-17 10:57:41 +08:00
jinhai
9433bf81cc MS-554 Change license to apache 2.0
Former-commit-id: e09b7dd7872372fa0ece9f5d18ec4c316b89cbe8
2019-09-17 10:51:48 +08:00
starlord
ef37fc9702 Merge branch 'branch-0.4.0' into 'branch-0.5.0'
refine cache code

See merge request groot/vecwise_engine!4

Former-commit-id: 1baa0f3ce6bb90667f090e2ee76f5c168a4ca76d
2019-09-17 10:01:27 +08:00
starlord
49c3b8e9f6 refine cache code
Former-commit-id: 9d74c7f97e3bca9bb43963ed6f05491e258b712c
2019-09-17 09:55:25 +08:00
Heisenberg
8fdef361b1 change cmakelist
Former-commit-id: 9a60b9fb71226b5b15e7bb2b755ff2ad53e6d922
2019-09-16 20:18:18 +08:00
Heisenberg
785a75a121 MS-552 Add and change the easylogging library
Former-commit-id: cc29d15a956a343622f1f17c63b1ada51bb172a5
2019-09-16 20:08:46 +08:00