Commit Graph

1638 Commits (a57e84e0a1bad291c34cc861bfe24ef598f14064)

Author SHA1 Message Date
wxyu 842fa507fb MS-380 Update resource loader and executor, work util all finished
Former-commit-id: 712a0aceaa4c8d4ebbea40f5d18f524afeb38559
2019-08-19 11:48:45 +08:00
xj.lin 0d0b8eeb3f MS372 fix unittest
Former-commit-id: 78f0c12c86ed19158b982d1f460e4a2497bb0585
2019-08-19 11:11:28 +08:00
wxyu 41f3a2ac2b MS-379 Add Dump implementation in Resource
Former-commit-id: 0ad824b5d582fc7235a0e29919fdf5a2975bf534
2019-08-19 10:47:30 +08:00
jinhai 4f8ccf9d82 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-373 Add resource test

See merge request megasearch/milvus!383

Former-commit-id: 579f97477d802bd344d4a393cb51ea910f98b534
2019-08-18 20:19:27 +08:00
wxyu 08a0f545da MS-378 Debug and Update normal_test in scheduler unittest
Former-commit-id: 7b5add0a2d27185abeec2a1c5df51716aa9fc361
2019-08-18 20:10:32 +08:00
wxyu 07ec15f9cd MS-377 Improve process thread trigger in ResourceMgr, Scheduler and TaskTable
Former-commit-id: f121fba66ae395b03ae31c400216b5e9c301f0cf
2019-08-18 20:08:15 +08:00
wxyu 4ed498893d MS-376 Add loader and executor enable flag in Resource avoid diskresource execute task
Former-commit-id: 489f60f97444c963a3dbfd913672f79b8a9a330e
2019-08-18 20:04:54 +08:00
wxyu de6d68238f MS-375 Add Dump implementation for Event
Former-commit-id: c8518b48914da67bce45660866970c8c4eee915a
2019-08-18 20:01:44 +08:00
wxyu 40d8172671 MS-374 Add action definition
Former-commit-id: 68c221b2845cb3fd640433eea72dba4490ca977f
2019-08-18 19:59:56 +08:00
wxyu ac230a7ec3 MS-374 Add action definition
Former-commit-id: d3ed4be48d8c27f380b9d20d7eb1bff6abe7cee0
2019-08-18 19:59:15 +08:00
wxyu a591e965c9 MS-373 Add resource test
Former-commit-id: 64c86f4852c4d0cb6d31a679e63ad7555e03d088
2019-08-17 19:08:10 +08:00
wxyu 4cb3e103fc MS-371 Add TaskTableUpdatedEvent
Former-commit-id: f252d63664cb09b502c7280d7a82f0cb1fcac169
2019-08-17 19:05:58 +08:00
jinhai e78231f995 Merge branch 'ms-372' into 'branch-0.4.0'
MS372 dev clone index and get index deviceId

See merge request megasearch/milvus!381

Former-commit-id: 82df26e98dbc3e09e90b38fb3cc27dfc70a0f62e
2019-08-17 17:34:09 +08:00
jinhai 6fa0303a3f Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-371 Add TaskTableUpdatedEvent

See merge request megasearch/milvus!380

Former-commit-id: 5861036ac83035935f549939ab0d201aaf632c91
2019-08-17 17:34:02 +08:00
xj.lin b3cc7de2c0 MS372 dev clone index and get index deviceId
Former-commit-id: adc85e54cc20c644f9d39df823c8b1b539ec7a19
2019-08-17 17:24:09 +08:00
wxyu 2c9bb7224d MS-371 Add TaskTableUpdatedEvent
Former-commit-id: cfcd409967d2e9d8f1747432f3b99c5e75ded768
2019-08-17 17:10:18 +08:00
jinhai a1d37d6c4f Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-368 Implement cost.cpp

See merge request megasearch/milvus!378

Former-commit-id: 2eb14ab3ce37df22b781d88c64baa702d9e4b971
2019-08-16 19:58:17 +08:00
wxyu 2ea773b930 MS-368 Implement cost.cpp
Former-commit-id: 554f06b109662bb381bb06aa73ddab956fb8c47c
2019-08-16 17:51:05 +08:00
jinhai 5b21339b24 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-366 Implement TaskTable

See merge request megasearch/milvus!376

Former-commit-id: 8c306fc80d70ec2e799efe9a79ebe0b8f4f922e2
2019-08-16 17:46:17 +08:00
wxyu 484f255f5e MS-366 Implement TaskTable
Former-commit-id: e6d189c5c63b0477384353bf6f75482eeb196c7d
2019-08-16 16:09:02 +08:00
jinhai 4f642936e5 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-365 Use tasktableitemptr instead in event

See merge request megasearch/milvus!375

Former-commit-id: baba5e363f2d9cb1a674fe64b63cc063329e4fae
2019-08-16 15:58:04 +08:00
wxyu 404bc88b3f MS-365 Use tasktableitemptr instead in event
Former-commit-id: a2d8fe7456dc59da280f475ae489a63fa9c3d362
2019-08-16 15:36:56 +08:00
jinhai 90c5e47bfc Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-364 Modify tasktableitem in tasktable

See merge request megasearch/milvus!374

Former-commit-id: 045ac24b40f35cb5b36835efbb2b7489d8c3fae3
2019-08-16 15:31:08 +08:00
wxyu 8ffd68ec51 MS-364 Modify tasktableitem in tasktable
Former-commit-id: 79ac92b18cc3842d6ccaceb6bdd50ff636ca80ab
2019-08-16 15:29:35 +08:00
jinhai afe77c7015 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-361 Add event in resource

See merge request megasearch/milvus!373

Former-commit-id: aba409e3abf11a9435898a02b031cca13502f5f9
2019-08-16 15:04:22 +08:00
wxyu df382a1644 MS-361 Add event in resource
Former-commit-id: d5f18c13d7111a582ad0bc839aa49879c6bb7d32
2019-08-16 15:03:10 +08:00
Yu Kun 5b26d194f3 add unittest
Former-commit-id: 89139a24caab971fa16b27b814ca4731efd0ea20
2019-08-16 10:20:21 +08:00
jinhai 44846cc1d9 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-359 Add cost test in new scheduler

See merge request megasearch/milvus!370

Former-commit-id: 68f9f10ea3f70d068d01437ba267cd89c7db7f54
2019-08-15 19:56:07 +08:00
wxyu c3469fa561 MS-359 Add cost test in new scheduler
Former-commit-id: 5ec53217a216927e3b0ddf211f1a56bb1a44f2b4
2019-08-15 19:09:59 +08:00
peng.xu 145ee0f514 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
add nprobe in search and preloadtable unittest

See merge request megasearch/milvus!369

Former-commit-id: 4c32c4bc443b2ee61df2708bc47994ad39be1284
2019-08-15 18:31:03 +08:00
Yu Kun fabcbe9172 fix preloadtable unittest bug
Former-commit-id: 8d19429bb3d4d58a1fcc31700dcc74685188280e
2019-08-15 18:08:46 +08:00
xj.lin cbc734d83b MS-337 dev basic Resource
Former-commit-id: 7486415fa96cd3db77320aeb4b01dd78a2b4c878
2019-08-15 15:58:08 +08:00
wxyu 9400101582 MS-357 Add minimum schedule function
Former-commit-id: da78df540b934e3f1d881b16f023d749e4b37101
2019-08-15 15:57:12 +08:00
Yu Kun 536daeea16 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 88fb929978ce4a016f8402c444668363aba35065
2019-08-15 15:14:59 +08:00
xj.lin c6f7423c79 MS-337 dev basic Resource
Former-commit-id: b2a6cc6eb4c8fb7509280bff4b3fccd77e73870f
2019-08-15 15:01:37 +08:00
Yu Kun 03b28a9bcd Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 2afda3c33fc5c4970005991d77937600904c312b
2019-08-15 10:32:43 +08:00
Yu Kun 608aa1b784 add nprobe and preloadtable unittest
Former-commit-id: dfaa1c4b36068c9de7499b48094ce39021d1213b
2019-08-15 10:32:36 +08:00
jinhai d5b6eceb66 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-355 Add copy interface in ExcutionEngine

See merge request megasearch/milvus!363

Former-commit-id: 4f19f0cdd109e74fdec0d9d5b992a6b7c384b8d7
2019-08-14 21:26:57 +08:00
wxyu c11c58a555 MS-355 Add copy interface in ExcutionEngine
Former-commit-id: 9320dde8c2452982c552f604289d2661e5c1907e
2019-08-14 21:24:20 +08:00
Jeff dc1f80d2d0 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
add gperftools dependencies

See merge request megasearch/milvus!361

Former-commit-id: 1ce0bb9c3dc1ee3f4ad61258e1db3376c48f0323
2019-08-14 20:36:04 +08:00
quicksilver 7cc6e173b1 add gperftools dependencies
Former-commit-id: cc8e3f68f5fbe3393ac966083b607b54ccb50fe8
2019-08-14 20:35:21 +08:00
jinhai 0cd9a97487 Merge branch 'MS-351' into 'branch-0.4.0'
fix bug unittest

Closes MS-351

See merge request megasearch/milvus!360

Former-commit-id: f1fe91d674b212bc4297bcdba846a693de4606d0
2019-08-14 20:19:11 +08:00
xj.lin 4e20eb16a4 fix bug unittest
Former-commit-id: bb332dbf8545bc4e3528bdf699e38cf396be902f
2019-08-14 20:18:13 +08:00
wxyu 7cb9401716 MS-354 Add task class and interface in scheduler
Former-commit-id: b76186ae5ae4057a704279a6ed24bfd17878c445
2019-08-14 20:12:14 +08:00
wxyu 9d7302cd7c MS-354 Add task class and interface in scheduler
Former-commit-id: a8697bf20ed0db126cc6857c6d7719a4731bd87d
2019-08-14 20:10:31 +08:00
wxyu 4de6f675ec MS-354 Add task class and interface in scheduler
Former-commit-id: 0a61d095db7144006b80bc0824886e62be71a5d5
2019-08-14 20:09:00 +08:00
xj.lin 59b63524da Merge branch 'branch-0.4.0' into MS-351
Former-commit-id: 2c8203f1e953247ad3bab65052d2b44811cc94e3
2019-08-14 19:50:21 +08:00
xj.lin 387e15455f MS-351 enable index move between cpu<=>gpu
Former-commit-id: 40841d540f1ded276f8455ffd863789edc2a1796
2019-08-14 19:48:48 +08:00
peng.xu 4b887cf094 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
add PreloadTable and some parameters

See merge request megasearch/milvus!355

Former-commit-id: b9e0a21d137dfb22983d1ed4e71e1f91354bd49c
2019-08-14 19:45:10 +08:00
Yu Kun b230f19ce5 fix bugs with discessions
Former-commit-id: 54cd32977b70608898c6c4c61e5971d4716a8e08
2019-08-14 19:23:56 +08:00
quicksilver 027ee6920c update build.sh
Former-commit-id: 800a68080248c20b0c83b86360205bd395ee0371
2019-08-14 19:17:03 +08:00
Yu Kun d7936a6c60 add some parameters and merge upstream
Former-commit-id: 680349208d62108ceda4ad822c466107a840327c
2019-08-14 19:06:38 +08:00
Yu Kun 83ab3a640c Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 7cf01fff2fd7f33db79845d5fe6ca1972262975e
2019-08-14 19:04:47 +08:00
quicksilver 8b7581cad8 update build.sh
Former-commit-id: 1bf5c621573c58f865e996cad2ad61b488155722
2019-08-14 17:32:52 +08:00
starlord 7047472cf7 for jenkins build
Former-commit-id: e69f393d71c54489917100acc18d125ded248471
2019-08-14 17:13:02 +08:00
starlord 75e1fa90e1 for jenkins build
Former-commit-id: fa78b4d2201879fd6fe2619d2b0e498c5f9bf433
2019-08-14 17:09:33 +08:00
quicksilver 1246bfd89e build knowhere
Former-commit-id: e743650d98d8131ae50952f65500728c379c76bc
2019-08-14 15:58:30 +08:00
Yu Kun 5ef5c11140 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 259fd94df3c95b445ccd8ff34be60f7343b873ee
2019-08-14 15:53:46 +08:00
Yu Kun ccec483e1e add preloadtable
Former-commit-id: f052a555777fce2a1d27478f7b2bb51d1e536c7c
2019-08-14 15:50:23 +08:00
starlord a7488c2478 milvus default version 0.4.0
Former-commit-id: a62048f862cb3c36187f59c19f14b31251291156
2019-08-14 15:25:50 +08:00
starlord 88d4020b4f fix conflict
Former-commit-id: 307526aa00a017b74c28b9a4d123b885631dd673
2019-08-14 14:46:30 +08:00
starlord d46d1e7f0d MS-350 remove submodule
Former-commit-id: 34c3bc3c966b666534229bed1ef03e30ad9c527b
2019-08-14 14:44:50 +08:00
starlord d9c8e22ac5 remove knowhere submodule
Former-commit-id: 949cb32d38482a60c357e8f95a84e0a546c5e98b
2019-08-14 10:37:38 +08:00
peng.xu 2e50a88f11 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
default grpc

See merge request megasearch/milvus!344

Former-commit-id: 726e8e5f3041f11933b4c096e839065ca4627940
2019-08-14 10:18:33 +08:00
starlord ac56710cb7 default grpc
Former-commit-id: 0e0421331684f7a44ccffa3fc24f6960d7d1114c
2019-08-14 10:14:23 +08:00
jinhai 3e4d98f04a Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-348 Add ResourceFactory Test

See merge request megasearch/milvus!343

Former-commit-id: c55c49518e73e46616d706fb9cb582dcef883d61
2019-08-13 20:29:24 +08:00
wxyu a0c52e3730 MS-348 Add ResourceFactory Test
Former-commit-id: 2b8519881eb88c532b0a02f7f515f345545cd55c
2019-08-13 20:18:21 +08:00
peng.xu 331535c89f Merge branch 'branch-0.4.0' into 'branch-0.4.0'
clean code

See merge request megasearch/milvus!342

Former-commit-id: f68abd3aeb74d796fc4d6ac000b7e61921fce2d8
2019-08-13 18:51:35 +08:00
peng.xu d7d41d5b58 Merge branch 'fix_MS-303' into 'branch-0.4.0'
fix MS-303

Closes MS-303

See merge request megasearch/milvus!341

Former-commit-id: 43aca5c912195fd7628ea467849bcd5fe95bd839
2019-08-13 18:51:23 +08:00
starlord dacd86f0af clean code
Former-commit-id: 81fdba0f5bc4e523f47b4f4f7fecac1fc5abdd62
2019-08-13 18:50:36 +08:00
xj.lin eb3f9aa6a5 fix
Former-commit-id: 7bb0559f007ef32b8331be8d4947ebe7595714b3
2019-08-13 18:49:46 +08:00
peng.xu cb67c47874 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-346 add .cpp to solve compile error

See merge request megasearch/milvus!340

Former-commit-id: 5d6f9b817c695f04019ccc2b70122f63117e4d2e
2019-08-13 17:56:56 +08:00
wxyu 7b83d2a62f MS-346 add .cpp to solve compile error
Former-commit-id: 3db400a1bd346ca72e591fbd6b3557387f435b0c
2019-08-13 17:55:12 +08:00
jinhai 09801053e9 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-345 Add Node Test

See merge request megasearch/milvus!338

Former-commit-id: d13ce00f0b0ca8f59b01034e447c1a0419d65bc0
2019-08-13 17:52:37 +08:00
Yu Kun dcf8d3e838 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 5bdebcd74b5a5d7665029f727ac452807d7f564f
2019-08-13 17:29:17 +08:00
Yu Kun bb9b6d36fd rename milvus_grpc_server to milvus_server
Former-commit-id: 54f295751d413a3af3765ff6334d25392ed17ac8
2019-08-13 17:29:13 +08:00
wxyu 46a184f1e3 Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
Former-commit-id: 567d2b89bf0e202d39bcf81c9b1e8121dea254e4
2019-08-13 16:45:55 +08:00
wxyu 741035b408 MS-345 Add Node Test
Former-commit-id: 71877f19888587a8ede17babdd332e852f587731
2019-08-13 16:45:39 +08:00
peng.xu 8b1b54f098 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-344 Add TaskTable Test

See merge request megasearch/milvus!334

Former-commit-id: 94dfae6b58e54bca27b36af35f09ee15dd0d75ec
2019-08-13 16:42:50 +08:00
starlord 039b38bc71 avoid jenkins break build
Former-commit-id: b326a6ae14befd2f5dad11076cc4299edc55d341
2019-08-13 16:37:22 +08:00
Yu Kun 18f82c0676 merge upstream/branch-0.4.0
Former-commit-id: 6f30324f85ed3f86c359a96b6877affff52a75c0
2019-08-13 15:42:41 +08:00
Yu Kun 1a06e7e944 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 41b7d12779189baff1a90aaf749c4a8f138e1584
2019-08-13 15:37:27 +08:00
Yu Kun 4ba11c02d4 add new interface definition
Former-commit-id: 1f5919bfd2b3a08422c408922733e40edd9c5db2
2019-08-13 15:37:16 +08:00
wxyu 065b8d4911 MS-344 Add TaskTable Test
Former-commit-id: 9607e4bbde87ae231dfedfc8e63ea78599675aa0
2019-08-13 15:37:13 +08:00
starlord 3e47b26d9f MS-343 implement ResourceMgr
Former-commit-id: f0f04297bb219cfa20e4eba609ff390f84e3a4a3
2019-08-13 15:28:27 +08:00
starlord 549b18f871 MS-343 implement ResourceMgr
Former-commit-id: 4cafc2cadf229ab61952233f1abc04d4ffdf9129
2019-08-13 15:22:01 +08:00
wxyu d551a1a3e7 MS-336 scheduler interface
Former-commit-id: 407e0af036d417a22e6002906773344fb6559818
2019-08-13 11:24:04 +08:00
jinhai e7c202b79c Merge branch 'branch-0.3.1' into branch-0.4.0
Former-commit-id: 0158e842f89d68cb712a3a19cda55678a47256ff
2019-08-12 15:01:17 +08:00
starlord 039a268f22 MS-330 Stability test failed caused by server core dumped
Former-commit-id: 6399857193109ff8d5886c9b8db168cda04026bb
2019-08-12 14:06:08 +08:00
jinhai 91f3c9a991 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
modify build.sh to make thrift on

See merge request megasearch/milvus!330

Former-commit-id: 956f04cd563d9c46a464d7703fcae73eb4e0e315
2019-08-09 18:30:04 +08:00
Yu Kun f8b7df5e0b modify build.sh to make thrift on
Former-commit-id: b38a915b34149df47de5be0611970490dd2751aa
2019-08-09 18:24:01 +08:00
starlord 414be9021d MS-330 Stability test failed caused by server core dumped
Former-commit-id: 66079f9b51b0e40adfc6dfbcf2d2156431124ebb
2019-08-09 18:19:07 +08:00
quicksilver aeae907d6d update build.sh
Former-commit-id: ec1488d6e4fecc756349dd88b056dda24b181b9a
2019-08-09 18:13:47 +08:00
Yu Kun 643a85999d modify start_server.sh
Former-commit-id: 0a020148bf0e9a22fc833f9d197fba63c7cc2377
2019-08-09 17:01:55 +08:00
Yu Kun ebd8cd9aeb merge upstream and fix bug
Former-commit-id: 45fa6852c3ad2303263cc836d30f3d2f76dd964f
2019-08-09 17:00:32 +08:00
Yu Kun db7513070a Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 2fc7b24448d516f5caf048b8a9840378a3548cfb
2019-08-09 15:46:53 +08:00
Yu Kun a68fa43ddd grpc and thrift server run concurrently
Former-commit-id: 4abfccaf6ee598bbb7cc47d48f943b8ca9726f12
2019-08-09 15:46:32 +08:00
starlord ce7e835658 handle exception in merge file
Former-commit-id: 0b1503599944acafa30e12642c3e00c915afc223
2019-08-09 15:34:11 +08:00
quicksilver 096845036b update grpc md5
Former-commit-id: 57821ab629fb4e144d2be216ce3d9cc0875afe56
2019-08-09 10:56:15 +08:00
quicksilver f50fa28ce8 add grpc cache
Former-commit-id: bd68cc1dcd7521f0daf66630fd00bf97d2145efe
2019-08-09 10:21:58 +08:00
quicksilver dd838e513c update cpp/cmake/BuildUtils.cmake
Former-commit-id: 0abe49b884bf39247e0e1f303c7f3f71b2511f5f
2019-08-08 19:21:21 +08:00
Yu Kun e4622314a8 add knowhere submodule back
Former-commit-id: b55a72fb55aea84b8df68971bd02188d51d21aed
2019-08-08 17:46:41 +08:00
Yu Kun 87226f5e92 add knowhere submodule back
Former-commit-id: 3da9baeac0ae5e163879f2adaacce5adad4f1f65
2019-08-08 17:39:36 +08:00
Yu Kun 41f723b18f Merge branch 'branch-0.4.0' of 192.168.1.105:kun.yu/milvus into branch-0.4.0
Former-commit-id: 6a44b05f060f493f8b769f7e0edf243cf30c4aee
2019-08-08 16:50:21 +08:00
Yu Kun 5707abd092 add knowhere
Former-commit-id: 009352f91536d366e3559f19614ced91f8be01e0
2019-08-08 16:32:17 +08:00
jinhai 6e04bf9ef2 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-313: add GRPC

See merge request megasearch/milvus!311

Former-commit-id: d488459184731d5c12599d1ecd5f3774b747ae69
2019-08-08 15:56:51 +08:00
Yu Kun 275cea60ff fix functions define format
Former-commit-id: 6f3af9f43c08b03827462a3d7cd0da047baf24c8
2019-08-08 15:52:20 +08:00
jinhai 72b51497ad Merge branch 'branch-0.4.0' into 'branch-0.4.0'
Branch 0.4.0

See merge request megasearch/milvus!317

Former-commit-id: d9ac08c2928ff02954e263c1b63a5256b816e68f
2019-08-08 15:52:02 +08:00
Yu Kun f7de49afe7 remove knowhere_build
Former-commit-id: 0a8468cb0f2247c81e39bf1215210470a277ba0a
2019-08-08 15:46:18 +08:00
starlord 39499d2f77 MS-327 clean code
Former-commit-id: 46b960c0a67766c4d67b36826ec88b47ae470206
2019-08-08 15:36:00 +08:00
jinhai 9620a673fe Merge branch 'branch-0.3.1' into branch-0.4.0
Former-commit-id: d3f1d181c97f95d9bee881adb0ff9be20aa0d951
2019-08-08 15:11:34 +08:00
Yu Kun 179a0feabf modify format
Former-commit-id: 74f43325a1b8ae17b1b7a5aeb61f0c6d7fd42de4
2019-08-08 15:02:27 +08:00
starlord 1d04dba7bb Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
Former-commit-id: cc366ea4feff59d555ddf80b70b8c77f049b8709
2019-08-08 14:42:14 +08:00
starlord 3f699e1757 MS-328 Check metric type on server start
Former-commit-id: 736c87b1731618461082b7171ffb366396a1dbd2
2019-08-08 14:29:07 +08:00
starlord 4d5618f4c3 MS-327 clean code
Former-commit-id: 9ca0ea6cb89b3fb95e17b0c0d6f647fe0c3ff7c4
2019-08-08 14:20:00 +08:00
Yu Kun dd48f79662 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 7bca577f8a3afe88301417dddfe4e1e66711b2d4
2019-08-08 11:01:17 +08:00
starlord 3056efda01 MS-312 Set openmp thread number by config
Former-commit-id: 511a0da7d85a341c0970f2e5823152b5ae2c71db
2019-08-08 10:37:01 +08:00
starlord b82fa58a98 fix build error
Former-commit-id: 2304715789a9bc684e88cdd666b679c7803fb043
2019-08-08 10:26:16 +08:00
kun yu 01a30b2ea6 merge upstream/branch-0.4.0
Former-commit-id: db495b0e7f256b98485986281fe83edf8beb6970
2019-08-07 20:23:39 +08:00
kun yu bbb49b4443 add changelog
Former-commit-id: 9eec1e77d6566b2142adcbb751668c810fa65646
2019-08-07 20:08:49 +08:00
kun yu cc5ab807fc delete knowhere
Former-commit-id: c04ad4797de102962ee39c6cf364926a120ddcd8
2019-08-07 20:01:44 +08:00
kun yu fe165a6165 delete knowhere
Former-commit-id: 295df91cf494ef9c1212a56fc2d4213ff8bc1d4d
2019-08-07 19:58:32 +08:00
kun yu 88998999f1 cannot use make_shared
Former-commit-id: dd213f89cdac4b36734a18078c1712872c8d8e84
2019-08-07 19:52:39 +08:00
kun yu 128b25e90a modify with comments
Former-commit-id: 9da07f5bcfcd872c2f9328bf1a5dae3b16553ed9
2019-08-07 19:12:56 +08:00
jinhai 79ea7ecbec Merge branch 'branch-0.3.1' into branch-0.4.0
Former-commit-id: b479db2044d96bd9cd84e3ed6d5a33c8df2442a6
2019-08-07 17:30:16 +08:00
starlord 29d7913485 MS-324 Show error when there is not enough gpu memory to build index
Former-commit-id: f0dff85efafe0a74629bfc766c05387e37e8a743
2019-08-07 17:27:31 +08:00
zhiru.zhu a1811deabf Update MySQLConnectionPool.cpp
Former-commit-id: 4b21d79885c0e28a24aceb266683e983174735cc
2019-08-06 19:36:42 +08:00
zhiru 4f79adcc86 add grpc
Former-commit-id: 34b2d866ee82370b6aa7fe6e18aae14a109cf5ab
2019-08-06 19:21:11 +08:00
zhiru bdc18ec361 add grpc
Former-commit-id: 5d2b02bc28510c77628b62ffdff7c01918b99a1e
2019-08-06 18:11:51 +08:00
zhiru 66d1cfe0c3 cmake: add grpc
Former-commit-id: 95283ed048e3c441c5005191adcccc29df04c4c3
2019-08-06 18:09:39 +08:00
zhiru 5b8f62c229 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: b2343181af61af6f369bae7cd747ade0378d8087
2019-08-06 18:07:45 +08:00
zhiru 81928c91e4 cmake: add grpc
Former-commit-id: 3a17c401ed59ff071040c6e67a6e7c76a315d958
2019-08-06 18:04:37 +08:00
starlord 1b0dd8ee90 MS-312 Set openmp thread number by config
Former-commit-id: 7ddafa3aa22d0455b343d07cc37b1a30d1ac29a1
2019-08-06 17:42:35 +08:00
starlord e9bb2e77fa MS-312 Set openmp thread number by config
Former-commit-id: 897d1c7387655046b4f769d695b9415785bd5108
2019-08-06 17:33:33 +08:00
starlord d2aa02084d MS-312 Set openmp thread number by config
Former-commit-id: 6ef7343aa6b908e6cd319271d4c60a49789eaf03
2019-08-06 17:31:43 +08:00
quicksilver b43ad62fa4 add gperftools cache
Former-commit-id: 4e42aaf2971f31b69b9074af189c31110c9474a2
2019-08-06 16:06:07 +08:00
quicksilver 5a841e9ff7 add libunwind cache
Former-commit-id: 12f0d46ccf26775f717f93cd42c9b3efdbe73876
2019-08-06 16:00:32 +08:00
quicksilver 3b23209c25 add zstd & aws cache
Former-commit-id: 8d509b788389631ef8d5ab8504393dabf1186ae0
2019-08-06 15:53:52 +08:00
quicksilver a672278435 add zlib cache
Former-commit-id: a9c217272ea23ea7add1db2941664fce5532e82e
2019-08-06 15:49:16 +08:00
quicksilver fdc8d5f3d8 add yamlcpp cache
Former-commit-id: 233e0287b04387cb2515ef863b43aeea7436cf19
2019-08-06 15:47:32 +08:00
quicksilver 0d1914d689 add thrift cache
Former-commit-id: 1a0ffac2e4c3b5a1d46a78cbf42918ab7a16cd2c
2019-08-06 15:45:12 +08:00
quicksilver 5a8b44bb8c add sqlite cache
Former-commit-id: 86d3ad2f14dd56ec6453af73682a7d322c77fa7d
2019-08-06 15:43:06 +08:00
quicksilver b1208cb4d5 add snappy cache
Former-commit-id: 1e598b7d393b48328910f7d4d340547067bd1058
2019-08-06 15:41:16 +08:00
quicksilver b8d4d74353 add rocksdb cache
Former-commit-id: 6fef8a6efa281bb65f6effdc6fedd7218de73642
2019-08-06 15:26:24 +08:00
quicksilver 00ebbec591 update prometheus cache
Former-commit-id: 40fa4e1cc250f3830ab98a1baafeb9ad99f441c0
2019-08-06 15:18:13 +08:00
quicksilver 735e14b218 update mysqlcpp cache
Former-commit-id: a98382caf3b3f5ae7a96e84277d2457ba0fd67f0
2019-08-06 15:16:57 +08:00
quicksilver bc6d8eedd7 update faiss & lz4 cache
Former-commit-id: 9c51a209d30846249ed6dfd13cf1f770332b5f05
2019-08-06 15:15:08 +08:00
quicksilver 1333eb14b4 update lapack cache
Former-commit-id: 5074d349281f913742b88d44977113367e580b4b
2019-08-06 15:10:52 +08:00
quicksilver 4596279dfa update openblas cache
Former-commit-id: c318b906d63dfcbd58e867f0a244e0e33ba4dedc
2019-08-06 15:08:44 +08:00
quicksilver 36c7a171dc update bzip2 & easylogging cache
Former-commit-id: aa9a3ecebb7b90f56628178f8ea4b4f4025da694
2019-08-06 15:04:48 +08:00
quicksilver 0dc135c1d8 update arrow cache
Former-commit-id: e5da81f23cee42d8acc8b7fa5efba36bd5aad312
2019-08-06 14:58:09 +08:00
kun yu 50d4411fea Merge remote-tracking branch 'upstream/branch-0.3.1' into without-grpc-version
Former-commit-id: c879bb4efe166bb643d8a990606d6585470a22c3
2019-08-06 11:27:49 +08:00
kun yu 6d41eb5650 add temperature and pcpu
Former-commit-id: 79e80d6e4ee42e05a5f9e60021fc4cc7ff9cc04d
2019-08-06 11:27:23 +08:00
kun yu b8a447990d merge branch-0.4.0
Former-commit-id: 8ab13046a40eb49349070ce4779dcae206647e02
2019-08-05 17:41:28 +08:00
jinhai 93c246fd7e Merge branch 'branch-0.3.1' into branch-0.4.0
Former-commit-id: fad50511cc6894adb68b05a933c6519c0c415a89
2019-08-05 14:18:21 +08:00
kun yu 0a8edff148 merge brach-0.4.0
Former-commit-id: c752d75ebd02e18c7e5fc1fb21edb32d1c381aff
2019-08-05 14:15:52 +08:00
kun yu 45bb9d679b Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 0c93c5c46c54a2e523142950a6f3bdc270235312
2019-08-05 09:44:42 +08:00
kun yu 409175f9d5 multi processes test
Former-commit-id: dd645c73b6983f86c5ed3b1a5a3480673bad4538
2019-08-05 09:44:29 +08:00
xj.lin adc77015b3 MS-307 enable-nsg
Former-commit-id: 5ed714d17e5ad58b610fd01d1041eb11203b15bf
2019-08-03 19:38:35 +08:00
xj.lin 3db2702ae8 Merge remote-tracking branch 'upstream/branch-0.4.0' into enable_nsg
Former-commit-id: 77d19051a4a9a945fc6068fa2641d0343b69ca27
2019-08-03 17:08:04 +08:00
xj.lin 9d28b40b0d MS-288 update build stage
Former-commit-id: 8ee0976b88b0772d85d74f65b52e3484b4c76bd5
2019-08-03 17:07:36 +08:00
jinhai c48357dd5b Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-251 Build/Merge background thread error handling

See merge request megasearch/milvus!302

Former-commit-id: 3820c658e6c2f86e683955979313d19009c10284
2019-08-02 20:52:08 +08:00
xj.lin 79f07fa33e update
Former-commit-id: 54181a6779cb2af53a4ad9f18b24404bd27caaca
2019-08-02 20:50:07 +08:00
quicksilver 4e61381e22 MS-306 - Optimize build efficiency
Former-commit-id: 60784fba792c36c179dbf33577a69760c747a857
2019-08-02 20:11:17 +08:00
quicksilver 2c73f07944 MS-306 - Optimize build efficiency
Former-commit-id: 2677dbfab283bcf64e78f2087f035257e7e5fb15
2019-08-02 19:54:45 +08:00
kun yu 90516aeb52 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 5474859a3d793694efca59e69eb33bedc2588baf
2019-08-02 19:30:15 +08:00
kun yu 0a9d60c504 modify clienttest
Former-commit-id: 512bbc2d6c6ae19d4c84befd71c41e79c67b5da0
2019-08-02 19:30:10 +08:00
quicksilver c49bebe0ef MS-306 - Optimize build efficiency
Former-commit-id: e221cb4134622b5f61d0e0fb48f678c17427a21d
2019-08-02 19:21:48 +08:00
starlord 60f527c9c6 MS-251 Build/Merge background thread error handling
Former-commit-id: 31f019f55f7c0bb896ebc6a5905af9ed07143cfc
2019-08-02 19:14:03 +08:00
zhifeng.zhang 30d25631aa fix arrow cache bug
Former-commit-id: 1ee10f7dcb5c8aee7d31ea29bff8218ab2142c92
2019-08-02 07:09:20 +00:00
quicksilver 17645fb09a add arrow cache
Former-commit-id: 339a01b685a572dbcb9cf934932762d287f2f857
2019-08-02 14:29:41 +08:00
quicksilver 20528fcb9a fix snappy include directory bug
Former-commit-id: eddadb646fb65f0d79b51c832375a1cdfe7870d4
2019-08-02 11:04:09 +08:00
quicksilver 28f82df09c mkdir aws include directory
Former-commit-id: 72e05aaa1bd5757af5a31fa46f54d3beca21e2aa
2019-08-02 10:57:39 +08:00
quicksilver 0f53637075 mkdir zstd include directory
Former-commit-id: 43f3350691d15bb2541ac0ba1b6287b9f5171a0a
2019-08-02 10:56:47 +08:00
quicksilver bb93daef2f mkdir zlib include directory
Former-commit-id: 2dfe47791648fad2a44c7ac829a3edd4bae54002
2019-08-02 10:55:35 +08:00
quicksilver b5f9c9ee02 mkdir thrift include directory
Former-commit-id: 044d2d2cea862e02e24cd211b676d6d8a2c9e95a
2019-08-02 10:54:35 +08:00
quicksilver 2b4f3fe896 mkdir thrift include directory
Former-commit-id: 740f163029d6be2ace00e41e238d41ab3c1cffe4
2019-08-02 10:53:27 +08:00
quicksilver f2f4cadc72 mkdir sqlite include directory
Former-commit-id: 10916354e7c5d9fcac97eee522f15e900613d59b
2019-08-02 10:51:35 +08:00
quicksilver 441dda4b6f mkdir snappy include directory
Former-commit-id: 250153a3d06d418800ae52ffda48c24b634d3633
2019-08-02 10:50:31 +08:00
quicksilver 8aca3e83fb mkdir mysqlcpp include directory
Former-commit-id: 16691c62dbf404739436ced50aec7b34cfbd7d14
2019-08-02 10:48:52 +08:00
quicksilver 5e671008bf mkdir lz4 include directory
Former-commit-id: 3302aac83877e89da70bc431743ea1693bb577da
2019-08-02 10:48:10 +08:00
quicksilver 2716ee7c1e mkdir lapack include directory
Former-commit-id: eb165bd6a279ea3a0ffddb1330d3cd9708255217
2019-08-02 10:47:05 +08:00
quicksilver a7ce37649a mkdir faiss include directory
Former-commit-id: 0ce0323e6fa1beded9a007b5aabeecc9c198a9e8
2019-08-02 10:45:25 +08:00
quicksilver bb522bb03c mkdir easyloggingpp include directory
Former-commit-id: 2546463d12a27ab7f4ff47e7c2db2ea781cb5359
2019-08-02 10:44:17 +08:00
quicksilver 80214abbd0 mkdir bzip2 include directory
Former-commit-id: a94b41bc5a865f52c1456b636b83158dd24c2e5b
2019-08-02 10:43:18 +08:00
quicksilver 3c63be382c update jfrog url
Former-commit-id: aed238792c59f708ceeef750c8a2d86b092977f8
2019-08-02 09:22:10 +08:00
quicksilver 9d016c8796 add aws cache
Former-commit-id: f95cfcd81aa4ffc728e2eedf22270f0ba7c0800c
2019-08-01 23:30:46 +08:00
quicksilver fdfeb8590d add zstd cache
Former-commit-id: 84a380e4f0e9cb41a3f66a6dc874e67487f09cc6
2019-08-01 23:25:26 +08:00
quicksilver 19fd38f467 add yamlcpp cache
Former-commit-id: 7f42eaac59377be0b36b00bbcfead3d4c7810ebb
2019-08-01 23:18:43 +08:00
quicksilver 8a01674e4c add thrift cache
Former-commit-id: e0ba93048762b0729d09dcbb4bfc52f8c2217c82
2019-08-01 23:10:18 +08:00
quicksilver e4a650dda1 add zlib cache
Former-commit-id: 4e0e20b9290b0ebcff8f2c0e5834c0c1050cd1e6
2019-08-01 23:04:11 +08:00
quicksilver c4e98d2081 add sqlite cache
Former-commit-id: 6fcce00a01160ba04820280684fab9af71e81534
2019-08-01 22:47:50 +08:00
quicksilver c4b18d0c7e add snappy cache
Former-commit-id: 73b5ea17d939b406564233fd3bfa19d9b46e43c1
2019-08-01 22:44:34 +08:00
quicksilver ad3174a2fb add mysqlcpp cache
Former-commit-id: 11f203c2b2db31eefa3d862fc6796c934751888b
2019-08-01 22:38:45 +08:00
quicksilver 945f5cdc2f MS-306 - Optimize build efficiency
Former-commit-id: a86e15afb113af0aed667a8a99bb164fa8bc00a0
2019-08-01 22:31:30 +08:00
quicksilver 53e59a231b add lz4 cache
Former-commit-id: e1744edbe7fb3a73298aa056cf85892d584883ff
2019-08-01 21:53:12 +08:00
quicksilver dce58c03ea add faiss cache
Former-commit-id: 39d09d89aa0f264fd5861c4dbc4794f90b99e9eb
2019-08-01 21:04:38 +08:00
quicksilver 3c2e45afa4 add lapack cache
Former-commit-id: 24c134fc2ddd18321e2503a2bda6b05e7d457b7e
2019-08-01 20:46:19 +08:00
quicksilver 969f780ff3 add openblas cache
Former-commit-id: c686ffa55a33c18b459cfb659a86ae0badb7782e
2019-08-01 20:42:47 +08:00
quicksilver 932f665a6a add boost & easylogging cache
Former-commit-id: 19e1f06da655df2ad9dee0088e283af5b811a364
2019-08-01 19:03:21 +08:00
quicksilver c5ce84db20 add third party cache function
Former-commit-id: ef521babd2c0a53bb42da74ef57c8ec0dd50d251
2019-08-01 17:34:57 +08:00
jinhai 678897aa2d Merge branch 'without-grpc-version' into 'branch-0.3.1'
Without grpc version

See merge request megasearch/milvus!292

Former-commit-id: 9f08a29c1b17a8e9f051b57055c334e674dd2464
2019-08-01 16:57:18 +08:00
kun yu 07de60005e fix GPU Percent bug
Former-commit-id: 0afa5d7a6a50c6a545c6fde296702580885d27b5
2019-08-01 14:42:20 +08:00
starlord 3a65524ef3 Merge branch 'branch-0.3.1' into 'branch-0.4.0'
MS-251 Build/Merge background thread error handling

See merge request groot/vecwise_engine!3

Former-commit-id: df7398aa2630011b83b2b92e39d7c7ea094d5325
2019-08-01 14:32:30 +08:00
kun yu af86fb92f3 modify prometheus
Former-commit-id: 95f2999b8627673954e16436ec07a890ba5cd22b
2019-08-01 14:30:00 +08:00
starlord 42bf2b0c46 MS-251 Build/Merge background thread error handling
Former-commit-id: b1d60b8ac5af8a0cf3fdfeb815c4b099e88a3e55
2019-08-01 14:09:51 +08:00
xj.lin 08e0aa836c remove faiss build useless gpu-arch
Former-commit-id: 4c79e50367d25a5336138fe90815d6488ff5244e
2019-07-30 15:34:44 +08:00
xj.lin 9232625a93 replace knowhere with megasearch/knowhere
Former-commit-id: ebc5f2dedbdc9fc7efdeecd8f2457f40829bbb31
2019-07-30 15:18:26 +08:00
xj.lin 7d782dbb9f remove personal project knowhere
Former-commit-id: 9d030089606c110f0a42159fb5200ae2fbbefcc5
2019-07-30 15:12:45 +08:00
zhiru b06cc9fe02 disable mysql unit test
Former-commit-id: 4f07286e00ceabe8fb700206ff45bbdda6bfe8d9
2019-07-30 13:53:45 +08:00
zhiru c16eabb538 disable mysql unit test
Former-commit-id: da61f1ae35c9ed2d8a363ffd2e85dfb634ae4b32
2019-07-30 13:51:59 +08:00
zhiru 6dd6798433 disable mysql unit test
Former-commit-id: cc3158053f3735e701d6c3de940eebeb25abafdd
2019-07-30 13:50:21 +08:00
kun yu 24a32a1c68 Merge branch 'branch-0.3.1' into branch-0.4.0
Former-commit-id: 89766cb15b69b48e0472a6aa11fb9744d31ff0b0
2019-07-30 10:37:29 +08:00
kun yu 5cf5708441 add error handle
Former-commit-id: 54393cf38c6436d7985a2a0fdc8609501fdf2c6a
2019-07-30 10:37:01 +08:00
kun yu 77e1ddd81b branch-0.4.0
Former-commit-id: a4df63653202df32d0b983de27f5c969905d17ac
2019-07-30 10:23:34 +08:00
kun yu dfb35391ba fix error handle while using stream
Former-commit-id: 2400cb8c1dea0a0c1b6de5a9a653c639122e2ecd
2019-07-29 20:17:10 +08:00
kun yu 593010fd91 fix search error handle bug
Former-commit-id: f205dec24e64f3380a71699e0148789559301d92
2019-07-29 18:50:41 +08:00
kun yu b9c11671c4 fix search error handle bug
Former-commit-id: dfded9c68611b0622581deebd1e94363566af432
2019-07-29 18:05:14 +08:00
kun yu 0c580bfa13 fix conflict
Former-commit-id: b1ebf9db86289bcb6afd9f30c3525b0df40433d6
2019-07-29 11:40:27 +08:00
kun yu 125191557c add empty and dim check
Former-commit-id: 319232d98f8c22d600ef31001a3798fff4dc18dc
2019-07-29 10:58:07 +08:00
jinhai 256b3702dc Merge branch 'branch-0.3.1' into branch-0.4.0
Former-commit-id: 6445b9ad1ec8db0fa1399563f187d206df04c63d
2019-07-28 09:55:56 +08:00
jinhai 5740985e0e Merge branch 'branch-0.3.1-xiaojun' into branch-0.4.0
Former-commit-id: a4c620656251f284789bead020c70a8fd64b4143
2019-07-28 09:30:31 +08:00
kun yu 95df40dd17 Merge remote-tracking branch 'upstream/branch-0.3.1' into without-grpc-vers
DFHN


Former-commit-id: 518029590606985fe9693f59ce099dd059390c1f
2019-07-27 16:48:09 +08:00
kun yu 54a71a9fa0 add CPU metrics
Former-commit-id: bb2dffc5abb87340a58a4791a23e55858073531f
2019-07-27 16:48:04 +08:00
kun yu 691df6ed18 add CPU_usage_rate Metrics
Former-commit-id: a2a914159d759f9724b70954758cd22d7d5c98ff
2019-07-27 16:19:34 +08:00
xj.lin 3314d47114 MS-288 update build stage
Former-commit-id: d9e0bfbbbb5060b65311b2f6eb8eadf531b918c2
2019-07-27 14:30:52 +08:00
starlord 4fc8921183 parallel reduce default false
Former-commit-id: 863941e425c4c2653367d2da6f13bebcb2b5eb96
2019-07-26 19:31:02 +08:00
xj.lin 66119dd20f MS-286 fix..
Former-commit-id: 056d394c7aff7f05ac5519a626e60e77e576fb63
2019-07-26 17:45:14 +08:00
kun yu 92467dc304 fix HasTable bug
Former-commit-id: 32797d1bbbdd953a492cabf7727dcedceb37e7a5
2019-07-26 15:39:17 +08:00
jinhai cf2aed57f4 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-260 Refine log

See merge request megasearch/milvus!280

Former-commit-id: 342de0cd5859636f3ee26b4777c4a196f32acb16
2019-07-26 13:07:39 +08:00
jinhai fc0cf0a1f2 Merge branch 'fix-bug-without-grpc' into 'branch-0.3.1'
fix quries/minute bug

See merge request megasearch/milvus!279

Former-commit-id: 6285b0b1a0d381771d4b44187f82e3344581ea81
2019-07-26 13:07:27 +08:00
starlord b5816a386c MS-260 Refine log
Former-commit-id: 0fbaa027ff33645bae10ce31ecd9ffa3c17894df
2019-07-26 12:29:36 +08:00
starlord bf8f5cca34 MS-260 Refine log
Former-commit-id: a67b4e677a6ad1b46a793119d19a6da85f2441c4
2019-07-26 12:26:45 +08:00
kun yu f74f9bb08c fix errorcode bug
Former-commit-id: a96852ef86254e08549a683c65c6ec797a782b74
2019-07-26 11:51:08 +08:00
kun yu bc08eb278a Merge branch 'branch-0.3.1' of 192.168.1.105:kun.yu/milvus into branch-0.3.1
Former-commit-id: 41b048b5c475833a6b7dc7aa52141447b855beaf
2019-07-26 11:25:27 +08:00
kun yu 805aef38af fix quries/minute bug
Former-commit-id: 63f4de823b290d346f4133d70e9a834054e12688
2019-07-26 11:19:51 +08:00
starlord b0557af128 MS-275 Avoid sqlite logic error excetion
Former-commit-id: 88c2b25f471afd80338280d2a522de89b242051b
2019-07-26 10:59:16 +08:00
starlord 640e9141c6 MS-275 Avoid sqlite logic error excetion
Former-commit-id: d6ecaf2f32ed6c75370e6ed2bd24779cc18e76ff
2019-07-26 10:54:49 +08:00
xj.lin aa771e7c3d update knowhere version
Former-commit-id: 0457623ff251b8bb925e289df0b9bf0ee097973c
2019-07-26 10:42:28 +08:00
xj.lin f37ae7765a MS-137 integrate knowhere...
Former-commit-id: 04bd70d29d1da919dbff9c39e0c60ccc6db57d23
2019-07-25 19:57:12 +08:00
jinhai 2ac2dfca01 Fix build error and refactor code
Former-commit-id: da6bf57fdebc0fc9b03251d7d9eb6c398dd35770
2019-07-25 19:57:10 +08:00
kun yu 6aba1d011b pull upstream
Former-commit-id: 82dafb79113706d919562c5aeefbf32ae010f9c3
2019-07-25 17:26:30 +08:00
kun yu af074d0eb5 Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: f3aad0f877176111021d537aa7ffcfb217041f45
2019-07-25 15:58:16 +08:00
jinhai 17fe748d30 MS-279 Merge from Branch-0.3.1
Former-commit-id: cd9e051d00423ae8a25f100366b1050f1604fca2
2019-07-24 21:28:24 +08:00
zhiru 99f92d8758 add IndexStatsHelper
Former-commit-id: d47bb68ff89728b31d237a62caa4d4d7673ceb0f
2019-07-24 20:36:35 +08:00
zhiru cfffcf9e9a Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: 4f3226d234fb9cbbab86cb7e85d65e97c5773e2c
2019-07-24 20:34:33 +08:00
zhiru 837da04dc9 add IndexStatsHelper
Former-commit-id: 6579465eb992d10a9a2f10b0f129341664f9b77d
2019-07-24 20:34:11 +08:00
starlord d7cbf9404a fix unittest unstable case
Former-commit-id: 2cc58215ffb327741e90824fecedf8a3073eebcc
2019-07-24 20:00:14 +08:00
jinhai 27b87309e9 Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: e28665f82b62580e41f371ccc4daa4cc6a474c55
2019-07-24 19:59:46 +08:00
jinhai 6acfd7f60d MS-276 Fix compile with volta architecture
Former-commit-id: 5d67c583a462764d368b3d83d337849d54c955f7
2019-07-24 19:59:19 +08:00
starlord a68e501b4b MS-266 Improve topk reduce time by using multi-threads
Former-commit-id: f19c6d78f7f9ab619de792fbb43efd86da0b07a1
2019-07-24 19:48:01 +08:00
kun yu db15ea57e9 fix structure
Former-commit-id: 6b4afd3c15236340eb666f22a0150ce090202b04
2019-07-24 19:29:18 +08:00
starlord 8b757539d2 MS-266 Improve topk reduce time by using multi-threads
Former-commit-id: fb7b6588c31ca34b48e349a5b928bca2d21fbc20
2019-07-24 16:28:47 +08:00
starlord f986af8671 MS-266 Improve topk reduce time by using multi-threads
Former-commit-id: ec370a34b214c9105f06a9bdea8f34728ed5026a
2019-07-24 14:09:06 +08:00
starlord e51b7f1619 Merge remote-tracking branch 'source/branch-0.3.1' into branch-0.3.1
Former-commit-id: 6093fec932087c5c92d82e454d76bd614090615e
2019-07-24 12:48:47 +08:00
starlord ed029178c4 MS-266 Improve topk reduce time by using multi-threads
Former-commit-id: 79e4cfe6ade7b0fc059cd246c4b670a4b5343ca3
2019-07-24 12:48:36 +08:00
jinhai afc40c454a Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-273 Add some logs and reformat code

See merge request megasearch/milvus!270

Former-commit-id: fe9e27aefd9bd73e12dd7aeaf709884b68da9ae6
2019-07-24 11:25:35 +08:00
jinhai aee7809c61 MS-273 Add some logs and reformat code, fix compile error
Former-commit-id: 5bf635ab31d5dfd0cdb558b7f038670098d75ed0
2019-07-24 11:17:53 +08:00
jinhai 34ca37d9a0 MS-273 Add some logs and reformat code
Former-commit-id: 5dfd98a0b954d5cc44ae40f6b14ce65a15d76f80
2019-07-24 11:02:22 +08:00
xj.lin 7b3886fd23 MS-267 default support IP
Former-commit-id: 64bfb03ea5291604f551530bc65896cc19841a5d
2019-07-24 10:33:41 +08:00
yudong.cai 29a177d129 MS-248 fix profiler build error
Former-commit-id: 817200ab3a01e34553090b8074726ea47f8fd7d8
2019-07-23 17:58:11 +08:00
starlord 07a9fdb8ca MS-246 refine log
Former-commit-id: 87ef7f959b43e92c3e7687f9f8e1d059cc353f79
2019-07-23 15:42:17 +08:00
zhiru 57fd142712 change BUILD_FAISS_WITH_MKL to default off
Former-commit-id: 8cf737578611bf2f05cc4da3a775328e6463d341
2019-07-23 10:42:47 +08:00
zhiru 5d1e887622 Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: 643c3e4dbad9a1be34bdf491b93d2a52e463a02e
2019-07-23 10:41:35 +08:00
zhiru 28e84f384d fix metrics
Former-commit-id: 2a7f67913dfdb615e09d7316053c59944132a8fe
2019-07-23 10:41:28 +08:00
xj.lin 813f5151e8 MS-267 Support Inner Product
update..


Former-commit-id: 8fdbb39fbdd05853f25c374f437f3ed78a46345d
2019-07-22 20:12:33 +08:00
peng.xu cdb031e62b Revert "Merge branch 'branch-0.3.1' into 'branch-0.3.1'"
This reverts merge request !264

Former-commit-id: 501e92946ab87fb9a21c55545f84ab8da499e1aa
2019-07-22 20:03:59 +08:00
peng.xu 531978a4b0 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-261: change BUILD_FAISS_WITH_MKL to default off

See merge request megasearch/milvus!264

Former-commit-id: 90a409dec7a99d93f95017e935971558923a997a
2019-07-22 19:44:33 +08:00
zhiru 397d9516f3 change BUILD_FAISS_WITH_MKL to default off
Former-commit-id: 2d61d5e7e25732ed8632d295992ac16378181c37
2019-07-22 18:24:26 +08:00
jinhai 9dc28812b4 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-246 refine log

See merge request megasearch/milvus!263

Former-commit-id: aa0a50e4e47241f55ba430cc6f024e6c473cd923
2019-07-22 17:50:56 +08:00
starlord 5f86066e8d MS-246 refine log
Former-commit-id: d8c30756db5666f964fd4fcf63fdc4a7ab08a4ea
2019-07-22 17:49:11 +08:00
jinhai 7c8b105d0b Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-261: change BUILD_FAISS_WITH_MKL to default on

See merge request megasearch/milvus!262

Former-commit-id: ea2f2de479e95449daaa8e928d5594d7bfba5eaf
2019-07-22 17:03:41 +08:00
zhiru f10d8e1b66 change BUILD_FAISS_WITH_MKL to default on
Former-commit-id: 2efee7ecceb466100ea0d875aeb1aeb3dbc02737
2019-07-22 17:02:03 +08:00
xj.lin ba7e3c3dd2 MS-265 IVFSQ
Former-commit-id: 6b0638af562ed60bc2252e4430c1018e29ae857c
2019-07-22 16:37:06 +08:00
starlord add911ae22 MS-249 Check machine hardware during initialize
Former-commit-id: 9f42d9c41dcfac9bc1716737368826bfcd777251
2019-07-22 15:33:36 +08:00
starlord f7742f7281 MS-249 Check machine hardware during initialize
Former-commit-id: 874dcaa8f6000158409de2865ca28050e4ceeac3
2019-07-22 14:25:33 +08:00
kun yu 128b3030da fix some bug for new version
Former-commit-id: 3fb8733f9932f09a986f7693f0f4935a849612c2
2019-07-22 11:30:56 +08:00
peng.xu 4762cbadb3 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-261: update faiss version to 1.5.3 and add BUILD_FAISS_WITH_MKL as an option

See merge request megasearch/milvus!258

Former-commit-id: 2440281de94fe39aaca4a82460eb20b8603266bf
2019-07-22 11:26:24 +08:00
zhiru 0ed96e5f2f fix
Former-commit-id: 162878ec45e3cd98555f08a1d3cf7fc343aa477a
2019-07-22 11:16:14 +08:00
starlord eb1d1e393f MS-249 Check machine hardware during initialize
Former-commit-id: e513499fb015a6867a762a10b629dd774182f21a
2019-07-22 11:15:11 +08:00
yudong.cai 4cff638c30 1. fix bzip2 download url
2. update exception


Former-commit-id: f9f9c4e49933f3e60c7245a886882ca187722cc7
2019-07-22 10:48:32 +08:00
starlord fe63fb509a MS-249 Check machine hardware during initialize
Former-commit-id: 86a0b2945852a9be8fd84422871855702445b7bf
2019-07-22 10:45:13 +08:00
starlord b285c64e96 Check machine hardware during initialize
Former-commit-id: fe3efe3b519235d9579e0c311a7da3f7a299154f
2019-07-22 10:44:24 +08:00
kun yu 4a967676fd Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: 59c36121db32e51794f1798160d90287bfb823b7
2019-07-22 10:33:10 +08:00
kun yu 48064dfdee add grpc
Former-commit-id: aee405b98f44290051fe022387c42bcb6d68cc76
2019-07-22 10:14:23 +08:00
zhiru 241320fb50 update faiss version to 1.5.3 and add BUILD_FAISS_WITH_MKL as an option
Former-commit-id: 2156052d9cf246e72168c4490d0b034ad6a00e47
2019-07-21 21:01:53 +08:00
xj.lin 100bdc0d4a update knowhere version
Former-commit-id: 3822bfab27fcaf68ad040615190ab56be725f8b2
2019-07-21 20:47:34 +08:00
zhiru 42b448d9ab update faiss version to 1.5.3 and add BUILD_FAISS_WITH_MKL as an option
Former-commit-id: c3efd4e0515a5145779a2d0fde552520d04e6d01
2019-07-21 20:47:28 +08:00
zhiru e24ae02665 update faiss version to 1.5.3 and add BUILD_FAISS_WITH_MKL as an option
Former-commit-id: 0c26016af4203d4849b8b9b710d005e83e32daea
2019-07-21 20:46:24 +08:00
starlord 9811720ae9 invalid topk
Former-commit-id: 3e5abac60d4c1b029f633f4162e504b543f36357
2019-07-21 18:34:59 +08:00
starlord 30513e6fa5 MS-260 refine log
Former-commit-id: 993f8fc97aba4ff7a696e3c355eccf1b837896c6
2019-07-21 18:03:35 +08:00
xj.lin 651f642d31 MS-259 add exception
Former-commit-id: 8f6b7b9c2e178146d0db55d14a2b716999d8dc0a
2019-07-21 16:10:26 +08:00
starlord f9fb3e36c9 MS-256 - MS-256 - Add more cache config
Former-commit-id: 9c2aad6170f3d2801e7d1a94b35ff04cdfbd2118
2019-07-21 14:11:53 +08:00
starlord e7888afbd3 MS-256 - Add more cache config
Former-commit-id: e65326f81cc7d051a33461af746a6fa8ef1e798c
2019-07-21 14:10:32 +08:00
yudong.cai 30407fef5a MS-257 update bzip2 download url
Former-commit-id: 0c307a4ea79b28ecafac2c9ce91a2525f12bfcca
2019-07-21 11:57:12 +08:00
peng.xu 07e031b085 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-248 update changelog

See merge request megasearch/milvus!242

Former-commit-id: 9acd9b7209f81e36c4b7ee7bcea4a4075eb41549
2019-07-18 17:22:08 +08:00
yudong.cai 24feb5767c MS-248 update changelog
Former-commit-id: cbb78e555685cb4164d37c7b822e5466c9ef28b3
2019-07-18 17:21:04 +08:00
starlord e0b6e66a69 change log size limit to 200MB
Former-commit-id: 6ce00771d20bd1fd18fdf4b4f58ad6f20a6c1bea
2019-07-18 15:35:43 +08:00
starlord 042646c915 fix a typo
Former-commit-id: df6a175ef25ba525c5952d7c3ed26a3aaeb4bf34
2019-07-18 15:11:32 +08:00
starlord 1ee82f8876 fix a typo
Former-commit-id: 8bbbf2d38c2273c646c9b6991536d26d2bd0252b
2019-07-18 15:10:57 +08:00