2030 Commits

Author SHA1 Message Date
starlord
c49fbe3a97 add compile macro to use old scheduler
Former-commit-id: ea1a194d0f0231980c7ffcacdf950e9686bf4ccf
2019-08-24 16:15:38 +08:00
Jeff
e1635d3eef Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-413 Remove thrift dependency

See merge request megasearch/milvus!420

Former-commit-id: 0b185c3244f0b90dc3a9bb8ac6b0eefe034d5fd8
2019-08-24 14:19:51 +08:00
starlord
4b73bda00e MS-413 Remove thrift dependency
Former-commit-id: 62ed2b780dc79f8415b3d63b902fb3757e523ef7
2019-08-24 14:19:09 +08:00
Jeff
cc5d6a71b2 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-412 Fix gpu cache logical error

See merge request megasearch/milvus!419

Former-commit-id: f31c61da4928f211d8ca47d9d06253170dc1d4aa
2019-08-24 14:18:17 +08:00
starlord
86ca848f2d MS-413 Remove thrift dependency
Former-commit-id: 00ef82d80e81b0076299436ec109025e6551e215
2019-08-24 12:20:32 +08:00
wxyu
662320c07d MS-412 Fix gpu cache logical error
Former-commit-id: 6bd2a056feee54393fa4bc16b1b233f54dac0500
2019-08-24 11:24:36 +08:00
wxyu
4023e110c0 MS-411 Fix metric unittest linking error
Former-commit-id: 166e354d7289a67a8950bbcc2baeb5ede1eb4c3f
2019-08-24 11:13:38 +08:00
wxyu
b57c7283ef Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
Former-commit-id: 8ac1a1578017a613885a110dab1d53b21c86dbb5
2019-08-24 10:22:26 +08:00
wxyu
60bc80ab76 MS-410 Add resource config comment
Former-commit-id: 804219cc7376652e3397e6195e094aaebc784adb
2019-08-24 10:22:05 +08:00
peng.xu
1766a316c9 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-409 Using new scheduler

See merge request megasearch/milvus!417

Former-commit-id: 82972459227e5f45990a4f59a56cb99f15721704
2019-08-23 21:15:24 +08:00
wxyu
59d66f490e solve conflicts
Former-commit-id: 3598c2e165c6f019ae291d5e3ae3fd4a19359f6b
2019-08-23 21:08:41 +08:00
wxyu
d233de81ff MS-409 Using new scheduler
Former-commit-id: bde50afd3f74e5b17405de9c21d0b5852b81c5df
2019-08-23 21:07:01 +08:00
peng.xu
9e93ae8f14 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
refine code

See merge request megasearch/milvus!416

Former-commit-id: d6336613e508359cc770cc0ee2609ddcc7ced329
2019-08-23 19:45:08 +08:00
starlord
06e64755e6 refine code
Former-commit-id: 144ba2695e0574b059481bdaef0f362d4e990f1d
2019-08-23 19:44:12 +08:00
starlord
ce63b710f6 MS-406 add table flag for meta
Former-commit-id: ed80394bb8a37bbc6b558ba0941e825996f81524
2019-08-23 19:12:47 +08:00
peng.xu
de8d6d6c7b Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-407: Reconstruct MetricsCollector

See merge request megasearch/milvus!414

Former-commit-id: 816cd0063cfc296b22b2f1ef1115719118881679
2019-08-23 19:12:00 +08:00
Yu Kun
7f9def461c merge upstream
Former-commit-id: 161080a5b239ecaab6bddca8dd7a539ae067c799
2019-08-23 19:09:16 +08:00
Yu Kun
bc1339c5f9 add MetricsCollector
Former-commit-id: 7953c0a4374624725507b6e7578628669a245ded
2019-08-23 19:08:27 +08:00
peng.xu
88f4a8bf57 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-408 Add device_id in resource construct function

See merge request megasearch/milvus!415

Former-commit-id: f4e03522076d4f25678d1f2afd606c7cf748e13e
2019-08-23 18:59:24 +08:00
wxyu
7f20eac0b2 Merge branch 'branch-0.4.0' of 192.168.1.105:wxyu/milvus into branch-0.4.0
Former-commit-id: 369dd0e5daba8dd3c61c6c8c754a01169026dade
2019-08-23 18:56:38 +08:00
wxyu
75370da1c7 MS-408 Add device_id in resource construct function
Former-commit-id: 770dfe33d2773fce93ec7f3824bfb052f7899fc5
2019-08-23 18:56:02 +08:00
Yu Kun
f562894905 remove some ref
Former-commit-id: 052bf2dd4cd3e5832fb8c284511bdde1919bf9bb
2019-08-23 17:55:24 +08:00
Yu Kun
1503673ab1 modify CollectorMetrics in InsertVectors
Former-commit-id: 32ed2cebf20dcb828a5d97a40f0c833a566d4d48
2019-08-23 17:38:31 +08:00
Yu Kun
61c66f5fa1 merge upstream
Former-commit-id: 5eefea12fc2e60084e0a2a86588534969d14d070
2019-08-23 17:31:57 +08:00
Yu Kun
2cd296875b reconstruct MetricsCollector
Former-commit-id: 4f7a219b9eb10d98068a5488967319b039fd695a
2019-08-23 17:25:49 +08:00
peng.xu
af45efd5d6 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-406 add table flag for meta

See merge request megasearch/milvus!413

Former-commit-id: 6213d8e45b38ede615793bf26a378c56123fbf3f
2019-08-23 16:39:04 +08:00
starlord
ceb4cc523b MS-406 add table flag for meta
Former-commit-id: 8e4aa5e4b4aa9844c82b262ce2ab3910a9b27aea
2019-08-23 16:38:03 +08:00
starlord
c600b71224 MS-406 add table flag for meta
Former-commit-id: acd9e3cbb26b7c2e74c1c566ba4ea8427a1da58d
2019-08-23 16:07:47 +08:00
peng.xu
13c98ea9df Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-405 Add delete task support

See merge request megasearch/milvus!412

Former-commit-id: 923c1c5c04ac3f5d6f676b127160daf1774ff700
2019-08-23 14:56:44 +08:00
wxyu
ed6ad2bac8 fix conflicts
Former-commit-id: d357aa8b25ecb26fcc11c89a98c2c6f0d690c1e2
2019-08-23 14:50:03 +08:00
peng.xu
6ba946911e Merge branch 'branch-0.4.0' into 'branch-0.4.0'
- MS-403 - Add GpuCacheMgr

See merge request megasearch/milvus!409

Former-commit-id: 41664e8a524d3f156c5bb977cc6225d9f3624c9e
2019-08-23 13:16:12 +08:00
Yu Kun
ed037699a8 fix merge conflicts
Former-commit-id: 9ca573e6e0d480a6d7e9e95dca6505454af42388
2019-08-23 13:13:59 +08:00
peng.xu
a597adae90 Merge branch 'caiyd_performance_tune' into 'branch-0.4.0'
Caiyd performance tune

See merge request megasearch/milvus!410

Former-commit-id: 645ce910c8bbafcfd46d3b7e0a0232c82da6d34a
2019-08-23 13:12:33 +08:00
Yu Kun
8e7d902a84 use memcpy in insert
Former-commit-id: fd1de2eca25ffc38481a49c8da914d4cb6ae7449
2019-08-23 13:10:46 +08:00
wxyu
aa6163937d MS-405 Add delete task support
Former-commit-id: a1982d73b6d2f2bfdaa6e134f5efc401b5e4a113
2019-08-23 11:35:36 +08:00
wxyu
94a4183b42 MS-405 Add delete task support
Former-commit-id: 8c7a9055a7c59fd29d0cec778080a75146d881a7
2019-08-23 11:34:31 +08:00
wxyu
49276fbf8c MS-404 Release index after search task done avoid memory increment continues
Former-commit-id: c73ee0674a6481aeabd4b055f7e62223cae9e205
2019-08-23 11:30:48 +08:00
yudong.cai
5264144ddb optimize grpc insert
Former-commit-id: 1f9d5ee34055303208c48e745d1252ae3c0b60a8
2019-08-23 11:27:21 +08:00
Yu Kun
e5383064a2 add changelog
Former-commit-id: 57c78623348c789206a5588aaf57f45046e052f9
2019-08-23 11:19:15 +08:00
Yu Kun
cedbd4d593 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 9287482fee45e33603fcf581324a11523ad88de1
2019-08-23 11:15:27 +08:00
Yu Kun
b576bd6f1f modify GpuCacheMgr GetInsatnce
Former-commit-id: 7323d4a63e58a6e70f8d47f6b2fbe9566197013c
2019-08-23 11:15:14 +08:00
peng.xu
0db8b8789c Merge branch 'branch-0.4.0' into 'branch-0.4.0'
fix index nlist bug

See merge request megasearch/milvus!408

Former-commit-id: 6fe8f7a888b681c7199d1730fab93849a8b29370
2019-08-23 10:44:56 +08:00
starlord
2c69cc3734 fix index nlist bug
Former-commit-id: f06514ca1962826241166f4ec55f6a4acd1a0105
2019-08-23 10:43:49 +08:00
yinghao.zou
6373c486a4 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
add GpuCacheMgr and metrics

See merge request megasearch/milvus!407

Former-commit-id: cd5639c8be8d6075a0447df5572004205f57cc3c
2019-08-23 10:34:47 +08:00
Yu Kun
4b4071f288 rename cache_free_percent to cpu_cache_free_percent
Former-commit-id: 782e596e71c9c7e9e36bb0c2977426ec4f3ebb7d
2019-08-23 09:19:50 +08:00
Yu Kun
580705869f Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: dbf69efc70adfafa11b40c3d470cdb4d39aae8f4
2019-08-22 22:14:24 +08:00
Yu Kun
30b437582d add GpuCacheMgr and unittest
Former-commit-id: 57e2a59b5039fca56e10c56ee5474472d87faa9a
2019-08-22 22:14:17 +08:00
yudong.cai
d416d1c6fc opt metrics
Former-commit-id: 3455b1ffc9d401e8e689c5833fb5e1985b3dc7b5
2019-08-22 19:16:49 +08:00
Jeff
2fde8943e2 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
update Check_Last_Modify function

See merge request megasearch/milvus!406

Former-commit-id: 0a6c6943e073bcc9e93aa883cbec20d8ed359a52
2019-08-22 19:11:34 +08:00
quicksilver
58a49caf45 update Check_Last_Modify function
Former-commit-id: 9e5d2130bb38f34eb381372a67350deda346870d
2019-08-22 19:10:57 +08:00