Commit Graph

2176 Commits (8d7480314ee737a080512df37c13ad40efd84f34)

Author SHA1 Message Date
starlord 8d7480314e MS-471 code coverage run failed
Former-commit-id: 9aea558d811b52f9e8349567a3746c3b89b683db
2019-09-04 14:29:46 +08:00
starlord 6376caae03 Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
Former-commit-id: 60a150ae5fa752e083ceb53e4492ae425f38ffb7
2019-09-03 17:10:08 +08:00
jinhai 79a861ed21 Merge branch 'fixBug' into 'branch-0.4.0'
MS-467: fix mysql db test bug

See merge request megasearch/milvus!474

Former-commit-id: 393ee7e7bae6fc0f77d3b0b732cd74ee07faf9a8
2019-09-03 17:06:00 +08:00
jinhai e940d3c4b0 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
refine code

See merge request megasearch/milvus!473

Former-commit-id: 9cf729c16944ec29956944a88b4578fd9795b6c9
2019-09-03 17:05:56 +08:00
starlord 1619acb517 Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
Former-commit-id: fb9720bc8bae865778e337335db1cfbad37209a4
2019-09-03 17:00:16 +08:00
zhiru e22d86d069 fix mysql db test bug
Former-commit-id: 517ac31e54b412259295db51f3b4c7ad42445f13
2019-09-03 16:32:00 +08:00
starlord 0399c2b57e refine code
Former-commit-id: cc73d87afb3ce7671f4103c06553562d63eaaf17
2019-09-03 15:24:01 +08:00
jinhai a9b5ec7ca2 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
fix unittest failure

See merge request megasearch/milvus!472

Former-commit-id: 1c56ddd3262644d69227b75b253d74f070e597ca
2019-09-03 13:56:51 +08:00
starlord 4452de4990 fix unittest failure
Former-commit-id: 9707d5d7550b9db72b4bbdd5c71f6e68febdb36d
2019-09-03 12:39:24 +08:00
jinhai 2e594177cc Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-463 Search timeout

See merge request megasearch/milvus!471

Former-commit-id: 54cf3521d710116cc87525d434c0f7c6962abe41
2019-09-03 11:27:33 +08:00
Yu Kun 83ab8a3406 MS-463 Search timeout
Former-commit-id: 7fc8d310d4335f972e995dcf8009aef0854779a5
2019-09-03 11:26:44 +08:00
Yu Kun 926d474887 MS-463 Search timeout
Former-commit-id: 35dad8989759e24fe749bb0429f72e911eb16aa0
2019-09-03 11:26:12 +08:00
jinhai 1030b27379 Merge branch 'enable_knowhere_test' into 'branch-0.4.0'
Enable knowhere test

See merge request megasearch/milvus!470

Former-commit-id: d4579d8670e8a3eb3d220850c3ab856e25ca8c72
2019-09-03 10:07:39 +08:00
xj.lin 0dc0df6bac Merge branch 'branch-0.4.0' into enable_knowhere_test
Former-commit-id: 2eece5caff6b83319bcab406ed91da85f21acb9f
2019-09-03 10:00:23 +08:00
xj.lin 36359554e4 MS-442 enable knowhere wrapper test
Former-commit-id: 6912138096ccc0966999edd6b9b199d7f2092202
2019-09-03 09:59:28 +08:00
jinhai d3cc563862 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-462 - Run milvus server twices, should display error

See merge request megasearch/milvus!469

Former-commit-id: 359cb7028ef8296841ce9a943ea1422b408208f0
2019-09-02 20:31:49 +08:00
Yu Kun d67a6bce46 merge conflict
Former-commit-id: 19b757b6692fb5a397b85f6188e8772790e04f37
2019-09-02 20:29:57 +08:00
Yu Kun 5857d8163e MS-462 Run milvus server twices, should display error
Former-commit-id: 5d9e7b62470cf48ba84d7be358b0f277268fa831
2019-09-02 20:28:01 +08:00
jinhai b85785674d Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-461 Mysql meta unittest failed

See merge request megasearch/milvus!468

Former-commit-id: d9c105ca5fc1d045867b365eb94030c33368a8d1
2019-09-02 20:11:39 +08:00
starlord 35276039a1 MS-461 Mysql meta unittest failed
Former-commit-id: 347d9c7f7181474175ff107b01da30074afb97c4
2019-09-02 20:10:51 +08:00
Yu Kun abb1979f0c change gpu_id type in config
Former-commit-id: 794d6af83b269a1cca1850cb7efd53387509113a
2019-09-02 19:23:20 +08:00
Yu Kun 63c4777924 add PushTaskToNeighbourRandomlyTest
Former-commit-id: e0617c1042a30dddd73838e0d87524a4eaff1293
2019-09-02 17:39:45 +08:00
jinhai 7af80a7142 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-455 Distribute tasks by minimal cost in scheduler

See merge request megasearch/milvus!466

Former-commit-id: ee4152eeed45d3b3812faa8b0915998ff726f0ec
2019-09-02 17:23:56 +08:00
Yu Kun 546b2446a5 fix conflicts
Former-commit-id: 7de5e483f6d684459aa90988b497fbf77fb398e6
2019-09-02 17:12:17 +08:00
Yu Kun d1d220561b MS-460 Put transport speed as weight when choosing neighbour to execute task
Former-commit-id: d82b330df300d269a3a11544fc5625ea317f9118
2019-09-02 17:11:26 +08:00
jinhai d03a453ee3 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-459 Add cache for pick function in tasktable

See merge request megasearch/milvus!467

Former-commit-id: 87ef67fad800ad371676d356fb46fe85b1e40f8c
2019-09-02 17:07:14 +08:00
wxyu 6c42b3e9c6 MS-459 Add cache for pick function in tasktable
Former-commit-id: ad4fc4b67499cc06b0fe0937c1ec16566d483239
2019-09-02 16:31:09 +08:00
Jeff 4081d6c0d3 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
Branch 0.4.0

See merge request megasearch/milvus!465

Former-commit-id: bf8ef7543c23a790aef1077dca480c3931fb9189
2019-09-02 16:18:27 +08:00
Yu Kun 600387fba4 fix bug
Former-commit-id: eb4a91c3bd2ddbe22994c8c5d856cfa6dce31fee
2019-09-02 15:53:11 +08:00
Yu Kun cdd2b08901 Add changelog
Former-commit-id: e6c748e6e697deab5ce38e71c694b3dd8bc1d7be
2019-09-02 15:49:34 +08:00
Yu Kun ff283ab44c fix multithread bugs in DBImpl
Former-commit-id: e4f12f64235bf5b5a84e69cfe866192240705ada
2019-09-02 15:47:01 +08:00
starlord 5fd7086780 fix typo
Former-commit-id: 559b01d7fa8e3aaeadedceb528ab2b112257c3b3
2019-09-02 15:23:12 +08:00
starlord 07778b29d8 fix typo
Former-commit-id: 00b3072fff2bb999bc22e76cfaf9b1971984906d
2019-09-02 15:22:25 +08:00
Yu Kun 3eac81698e fix confilct
Former-commit-id: e0360836c4ef54aa8dca66c7fd3225d88b5bb189
2019-09-02 10:56:03 +08:00
Yu Kun 576e7f12a4 MS-455 Distribute tasks by minimal cost in scheduler
Former-commit-id: 11b0752a1b4d19b94fca51701ce2abaece2ef4b8
2019-09-02 10:54:29 +08:00
jinhai 01f2db332a Merge branch 'branch-0.4.0' into 'branch-0.4.0'
fix unitest crash

See merge request megasearch/milvus!464

Former-commit-id: 9e2aed453ede3878da5d92a9aadcad22f4ac0da4
2019-08-31 18:08:04 +08:00
starlord 8c63489df3 fix unitest crash
Former-commit-id: 977fe7218389c0cc892f70b6499ffca834e54283
2019-08-31 18:07:21 +08:00
jinhai 9282bf65b4 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-451 Update server_config.template file, set GPU compute default

See merge request megasearch/milvus!461

Former-commit-id: b2834a438f6a2fa8d746616fd3d54de11551b92f
2019-08-31 17:18:26 +08:00
Jeff f03e3af582 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
fix typo

See merge request megasearch/milvus!462

Former-commit-id: 245bded1d2d1eec1f051d91a6f74f72bbbcff693
2019-08-31 16:55:58 +08:00
starlord 03bcdfe4f4 fix unitest crash
Former-commit-id: cf6b44ec306f20ab56aa7fecf7b3e9efcb291563
2019-08-31 16:52:49 +08:00
Jeff a9a4997fe0 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
add faiss md5

See merge request megasearch/milvus!463

Former-commit-id: ba9e49ce4e3e61caa46677b51b5a8de7bdd90bfb
2019-08-31 16:38:32 +08:00
quicksilver d4906c5e83 add faiss md5
Former-commit-id: 5a7fe90a9077a01c4cb5d6c78059056b6570d1bf
2019-08-31 16:38:01 +08:00
Jeff 1edec1008b Update milvus_build_no_ut.groovy
Former-commit-id: b9eb10cec1498f8daabcae0c7049aeb0c805a1e3
2019-08-31 16:24:37 +08:00
Jeff 841d2a4abb Update milvus_build.groovy
Former-commit-id: 15db5c442e9f484d1e8ba36dd2b53b9fb31862b6
2019-08-31 16:24:21 +08:00
starlord 08ea0c35ff fix typo
Former-commit-id: 019645a293b7f9cad3308d130dcf208dbdb6f3b0
2019-08-31 16:04:52 +08:00
wxyu c255604d79 Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
Former-commit-id: ae55cf81b898bf7db4a1fca0da2e8d1bac9596eb
2019-08-31 15:48:04 +08:00
wxyu 2e892c8ac3 MS-451 Update server_config.template file, set GPU compute default
Former-commit-id: a2ab91f2390243498fbc0814989412b90b56e627
2019-08-31 15:47:52 +08:00
jinhai 16ece61364 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-449 Add vectors twice success, once with ids, the other no ids

See merge request megasearch/milvus!459

Former-commit-id: cc835bcb95bb12abe9e32690f01f6e4187bc63ea
2019-08-31 15:23:05 +08:00
jinhai 4612c09fd1 Merge branch 'update_build' into 'branch-0.4.0'
MS-442 update build stage

See merge request megasearch/milvus!460

Former-commit-id: fdd7ec98815f4986e20c953c14675108bd9930a2
2019-08-31 15:23:00 +08:00
starlord 05e9c06e81 MS-449 Add vectors twice success, once with ids, the other no ids
Former-commit-id: 8ded87f809525d7bb43eaea21cbebf11ce30c6ef
2019-08-31 15:21:20 +08:00