Commit Graph

1638 Commits (a57e84e0a1bad291c34cc861bfe24ef598f14064)

Author SHA1 Message Date
starlord d599ebae06 MS-413 - MS-413 - Create index failed and server exited
Former-commit-id: a484d70aed5b3d9a61d6c4acc5917cab9394019e
2019-08-27 22:17:02 +08:00
starlord d15873f0b6 refine code
Former-commit-id: 0f8cbbaba8cf518bdec7466169f575c0ef0f93e3
2019-08-27 22:17:02 +08:00
Yu Kun 148caad58d MS-428 Add PushTaskByDataLocality in scheduler
Former-commit-id: c8c9b7a7ef5d81f7ad40f2116f7ce01dbe13b90a
2019-08-27 22:16:18 +08:00
Yu Kun 1769ae31ce fix status constructor bugs
Former-commit-id: 6d3921dd4cdbdbe7869425b603122760eb27366d
2019-08-26 21:23:58 +08:00
wxyu 77e1fe8026 Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
Former-commit-id: 2f5f12df670d8d1f727fee1ad5284a4f1cb2a556
2019-08-26 20:06:58 +08:00
wxyu b725f8872f MS-422 Support DeleteTask in Multi-GpuResource case
Former-commit-id: eea952afdf004ba46b9a55b58818ece35ecc9179
2019-08-26 20:06:44 +08:00
starlord b75c4750ee fix unittest crash
Former-commit-id: 6c33061c84df42160fd24b3c4e03ed39a2abee0a
2019-08-26 19:25:50 +08:00
starlord 08917ab68a avoid lcov error
Former-commit-id: 3085055a50b0ec0aa895675ad44ac651027c573b
2019-08-26 16:05:48 +08:00
wxyu 5bbc291bb4 Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
Former-commit-id: 7eec087d6ec54b880b38989cb217e84491001632
2019-08-26 15:36:28 +08:00
wxyu 63b43a2aa4 MS-421 Add TaskLabel in scheduler
Former-commit-id: 5a96ba4e51f67d13e2440af594034dacd6b6097b
2019-08-26 15:36:19 +08:00
starlord cd36c006f2 refine code
Former-commit-id: 964034f46d6ca2b81817a2ab089f16c8664bfd02
2019-08-26 12:31:13 +08:00
starlord db47dbbd8d fix typo
Former-commit-id: 14737e066a87aa85fdb9866123d6e0a126893f61
2019-08-26 10:48:32 +08:00
jinhai f75cf9d1fa Merge branch 'branch-0.4.0' into 'branch-0.4.0'
fix typo

See merge request megasearch/milvus!429

Former-commit-id: f4eeae6eaca344cdb744e463a490311fe77f16a0
2019-08-26 09:28:55 +08:00
starlord 3176c94a4f fix typo
Former-commit-id: 263f2a106699c428715b646fcfbc44ff90dd2ffd
2019-08-26 09:28:08 +08:00
Yu Kun e089b488e0 fix metricbase_test bugs
Former-commit-id: 720470f165ab92744b6c4c1caa73092b3b27103e
2019-08-25 16:23:22 +08:00
Yu Kun 30fdd4a026 add metrics
Former-commit-id: 3f894aacdc7eda6ef900d6aafcabffe8bf5a0cb4
2019-08-25 15:38:18 +08:00
Yu Kun fb3a2ddce1 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 78537429619c1c77639d0f5c2695e6d3d3d1b2e2
2019-08-25 15:31:45 +08:00
Yu Kun c8b31c16a6 modify DescribeIndex bug
Former-commit-id: 284bf1fc830ace11385fc96790eb9d525541295e
2019-08-24 20:00:25 +08:00
Yu Kun f44b007cc8 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: be07f42345fd96adf2aa13588b45e6ada88eb7d4
2019-08-24 19:11:07 +08:00
Yu Kun 8e12445e66 add GpuCache Metrics
Former-commit-id: 9da6fcb11f69302fb1c00bb16fe4c6f7b7699ee5
2019-08-24 19:10:53 +08:00
wxyu e5c4476db4 solve conflicts
Former-commit-id: 79d4e00b90019c196b065b2654535c689dec3900
2019-08-24 17:50:23 +08:00
starlord 36c93cb8f9 MS-419 Move index_file_size from IndexParam to TableSchema
Former-commit-id: f0457d9ac25559b0b64deb0aa3bfaccdcc1b1de2
2019-08-24 17:35:03 +08:00
wxyu 539dade5b2 MS-418 Update server_config.template file, set CPU compute only default
Former-commit-id: 62ea51804d4c6ba538de6c329d80411774137a75
2019-08-24 16:57:15 +08:00
wxyu 527026c4a0 MS-417 YAML sequence load disable cause scheduler startup failed
Former-commit-id: d9055c6ed60306ee8cfc09f13694b9186167a4a5
2019-08-24 16:44:30 +08:00
wxyu 2e8f018e40 MS-416 ExecutionEngineImpl::GpuCache has not return value cause crash
Former-commit-id: 298969de85a0a8cb4a4e48da21d45fde30df64d1
2019-08-24 16:42:15 +08:00
wxyu 14b2254060 MS-415 Add command tasktable to dump all tasktables
Former-commit-id: 7ce1dedf36d020668af2bcaafa66b5232d4c18a5
2019-08-24 16:39:47 +08:00
wxyu 2d9762afce Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
Former-commit-id: c624889110dcaa88a161f39c21baa08b87db9215
2019-08-24 16:37:17 +08:00
wxyu 35e28f81b5 MS-414 Add TaskType in Scheduler::Task
Former-commit-id: d470511e0d22832db09607ad017c6dd4a697cf05
2019-08-24 16:36:56 +08:00
starlord c49fbe3a97 add compile macro to use old scheduler
Former-commit-id: ea1a194d0f0231980c7ffcacdf950e9686bf4ccf
2019-08-24 16:15:38 +08:00
starlord 4b73bda00e MS-413 Remove thrift dependency
Former-commit-id: 62ed2b780dc79f8415b3d63b902fb3757e523ef7
2019-08-24 14:19:09 +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 60bc80ab76 MS-410 Add resource config comment
Former-commit-id: 804219cc7376652e3397e6195e094aaebc784adb
2019-08-24 10:22:05 +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
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
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
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
wxyu ed6ad2bac8 fix conflicts
Former-commit-id: d357aa8b25ecb26fcc11c89a98c2c6f0d690c1e2
2019-08-23 14:50:03 +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
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
quicksilver 58a49caf45 update Check_Last_Modify function
Former-commit-id: 9e5d2130bb38f34eb381372a67350deda346870d
2019-08-22 19:10:57 +08:00
peng.xu 86779397b1 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-402 Add dump implementation for TaskTableItem

See merge request megasearch/milvus!405

Former-commit-id: 2e0906cdbc8e4bae7c14e3ae25f71683a71344c0
2019-08-22 19:02:20 +08:00
wxyu bfa7f7c95f MS-402 Add dump implementation for TaskTableItem
Former-commit-id: f2957c7e7cf0c719b9b814f2e8ac16b42c396b2b
2019-08-22 19:01:44 +08:00
starlord 51475e3d37 fix index size bug
Former-commit-id: fdc398b873ffc25d25eeff5c05ae87ecb0872937
2019-08-22 18:39:06 +08:00
Yu Kun a6ef8becf7 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 064eb796b95e9d1679e39708b64ce8ee5f0a2bc5
2019-08-22 15:59:10 +08:00
starlord f0d9b0f5e4 fix row count bug
Former-commit-id: d2a9faa6a20ebeb88f8ef2fdb77180a6c216625c
2019-08-22 15:59:06 +08:00
Yu Kun 3d79ccd97b add GpuCacheMgr
Former-commit-id: c95181ef545748516cad9d3c0561fb8f753c6f37
2019-08-22 15:59:01 +08:00
peng.xu 59ff9b57f3 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
refine code

See merge request megasearch/milvus!402

Former-commit-id: 1b896db5f16336e00d848fe600709b4a20bf0179
2019-08-22 12:31:58 +08:00
starlord 50a4de6d93 refine code
Former-commit-id: 7283855c5965c6e9fb95cfcc3d0146fc7dcefccf
2019-08-22 12:31:00 +08:00
peng.xu e66685c1fa Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-400 Add timestamp record in task state change function

See merge request megasearch/milvus!401

Former-commit-id: 574adedca801d53ece9360c542e07803cc57bac8
2019-08-22 11:58:28 +08:00
wxyu 4f5466dbe8 MS-400 Add timestamp record in task state change function
Former-commit-id: 062045c8e5cbd0b0c71a05e0f5650ea943e4b3fa
2019-08-22 11:56:45 +08:00
starlord 5b918a4028 MS-339 implement new api
Former-commit-id: 53e4a9309807b06dc43761755146d54d5ef63cf5
2019-08-22 11:50:18 +08:00
starlord e6d4b638b7 merge 0.3.1
Former-commit-id: fbb9a3a12fbfe4a596a383eaed833f2d366c17a3
2019-08-22 09:26:08 +08:00
starlord 45a777b4d5 merge 0.3.1
Former-commit-id: 6fa5ce5365752369865360d715659c56fc367f89
2019-08-22 09:21:15 +08:00
peng.xu 42cdf9a11d Merge branch 'branch-0.4.0' into 'branch-0.4.0'
add DeleteByRange interface

See merge request megasearch/milvus!396

Former-commit-id: f875eab044460d5f2ce81bc04acc9784e959e8d0
2019-08-21 19:25:42 +08:00
peng.xu f31ae64221 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-394 Update scheduler unittest

See merge request megasearch/milvus!397

Former-commit-id: 2ad26a7acb68a6928150131526ed78ed2e0d373e
2019-08-21 19:25:28 +08:00
wxyu 598f9f30dc MS-394 Update scheduler unittest
Former-commit-id: b4f0fe18d00b17c47a39e2a06cdd1119ae00d7fc
2019-08-21 19:22:38 +08:00
Yu Kun acbec2f657 fix merge bugd
Former-commit-id: c3ee55050faefd76433e807842c7873c91dc6aba
2019-08-21 19:08:31 +08:00
Yu Kun 7c8770b399 merge upstream and fix comflicts
Former-commit-id: 1fd44ef580cb92d519da8a57d13c6ef8982efd26
2019-08-21 19:05:13 +08:00
starlord d30e432e16 merge 0.3.1
Former-commit-id: a538685c673319581c756289a4c003fa5833d829
2019-08-21 18:35:57 +08:00
wxyu 8b7273dadb MS-391 Add PushTaskToNeighbourHasExecutor action
Former-commit-id: 11c3e1f9fce24225d16c2d3f500c2f76e46388e2
2019-08-21 18:27:05 +08:00
wxyu 1c89d40c94 MS-390 Update resource construct function
Former-commit-id: 1f87f3e285798b2bf3dda78537fdb2b0fc7cc6ef
2019-08-21 18:22:52 +08:00
Yu Kun e83c4278db add deletebyrange interface and unittest
Former-commit-id: 54a94b0924d2de5089a4f31810e31a765bceb591
2019-08-21 18:02:37 +08:00
wxyu a79017ef8f MS-389 Add clone interface in Task
Former-commit-id: bf4681eec6cc6e6b21087b82e5bb5676ec3418d9
2019-08-21 18:01:23 +08:00
starlord 223cf1f547 MS-338 NewAPI: refine code to support CreateIndex
Former-commit-id: b3a60c3de2da5522b2b9becd8ba382825a1c1e05
2019-08-21 16:53:31 +08:00
Yu Kun c1e82cb749 add vector ids check in unittest
Former-commit-id: 26c60e303c5ede2200c77efee11b17a782d0dc46
2019-08-20 16:49:04 +08:00
Yu Kun da6e37c8b8 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: af1332f7b1aa9fe5a504644581a3658665d50e2b
2019-08-20 15:58:57 +08:00
Yu Kun 9c6c7c31ec add vector_ids in Insert
Former-commit-id: d793fa40cfa71e910e34998e3962df61de6f40f3
2019-08-20 15:58:46 +08:00
peng.xu 3b31d63b53 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-384 Add global instance of ResourceMgr and Scheduler

See merge request megasearch/milvus!391

Former-commit-id: 1030c47545d1d972c64ab967188f0e6ccf7b287e
2019-08-20 15:14:06 +08:00
wxyu 6171d3bbe0 MS-384 Add global instance of ResourceMgr and Scheduler
Former-commit-id: f176c49d75dbb820b37c356fde99cd62cdc2c9c9
2019-08-20 11:10:52 +08:00
jinhai 7f77711938 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-383 Modify condition variable usage in scheduler

See merge request megasearch/milvus!390

Former-commit-id: 262de61e8cbc2430d7dfea90e5db0b8c8cbccd2b
2019-08-19 22:03:45 +08:00
wxyu 03b049b10b MS-383 Modify condition variable usage in scheduler
Former-commit-id: 5be1c8879d1a77d444a5722dbd806a5eb00973e5
2019-08-19 22:01:39 +08:00
Yu Kun f944df41bd Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 81ebc3a6ab38577ba4945b7db4022d9725586f19
2019-08-19 20:17:05 +08:00
peng.xu 8b3d867a43 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-380 Update resource loader and executor, work util all finished

See merge request megasearch/milvus!387

Former-commit-id: 2c942b172d24ffa494c756b5ce0eca9bad9f0e42
2019-08-19 11:49:48 +08:00
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