Commit Graph

2259 Commits (3cb39ba1577b1f72744b58a2bab144f4d81aeeac)

Author SHA1 Message Date
Yu Kun 7c8770b399 merge upstream and fix comflicts
Former-commit-id: 1fd44ef580cb92d519da8a57d13c6ef8982efd26
2019-08-21 19:05:13 +08:00
peng.xu bd0c77f145 Merge branch 'merge34' into 'branch-0.4.0'
Merge 0.3.1 to 0.4.0

See merge request megasearch/milvus!395

Former-commit-id: 37a12b35746098694ede603e06e3293f3959768a
2019-08-21 18:42:55 +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
peng.xu 414eacbdbc Merge branch 'branch-0.4.0' into 'branch-0.4.0'
add vector_ids in Insert

See merge request megasearch/milvus!393

Former-commit-id: 30f412e9081fa000243167a5974937b93539314a
2019-08-20 16:50:53 +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
Jeff a7f33e49fa Update publish_docker.groovy
Former-commit-id: c498b440eb6eeee9ed9c3b88d35d9796276edc8b
2019-08-20 14:28:17 +08:00
Jeff e0a7598803 Update publish_docker.groovy
Former-commit-id: b246d6e84b0c1e5fd037f90d1b77dd9b2dc08134
2019-08-20 14:12:08 +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
peng.xu 01e03d8f92 Merge branch 'fix_unittest' into 'branch-0.4.0'
MS372 fix unittest

See merge request megasearch/milvus!386

Former-commit-id: dbaf5e209ed7cd4b7878d90e5c428e6f93c4cdbe
2019-08-19 11:12:47 +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 c2cd0edb09 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
add DOCKER_PUBLISH_USER parameter

See merge request megasearch/milvus!384

Former-commit-id: 8f05a8e093a2bf146b0d1cf325d761f705abb242
2019-08-18 20:19:40 +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
quicksilver 511970733d add DOCKER_PUBLISH_USER parameter
Former-commit-id: fcf5da0a8fae941b2763905aa5d1bbd7975ffa03
2019-08-17 22:14:54 +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