Commit Graph

1990 Commits (c2ab2bc0925805e0b6fa03ee952b42806803cb77)

Author SHA1 Message Date
Heisenberg e8224fc61d MS-569 Complete the NOTICE.md
Former-commit-id: dd04582d0ac67e31fdb503a70647cdd3eadebd4a
2019-09-18 19:53:08 +08:00
wxyu 3c6f49f9cc MS-555 Remove old scheduler
Former-commit-id: e07f211e59232b04cfa3f37240e896461ad9b616
2019-09-18 19:52:23 +08:00
wxyu e72b0348f7 MS-555 Remove old scheduler
Former-commit-id: 8eb7f773a15df78f46bf61a59ec0ea9d8923cc28
2019-09-18 19:44:38 +08:00
jinhai aec552789c Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-566: Refactor cmake

See merge request megasearch/milvus!578

Former-commit-id: 17ab315d0176908e548b31e33801ceb78b0ca05e
2019-09-18 19:02:33 +08:00
zhiru 666c6003f4 update
Former-commit-id: 1a3242b1ac87cad3274cc28d2e73697e55936e8b
2019-09-18 19:00:40 +08:00
jinhai 0fb840b91c Merge branch 'branch-0.5.0' of http://192.168.1.105:6060/megasearch/milvus into branch-0.5.0
Former-commit-id: 9efc38e4e13c7c10ace0b00c602a3c1bad63707c
2019-09-18 17:47:30 +08:00
jinhai 4305c8305f MS-567 - Add NOTICE.md
Former-commit-id: dba7a33adab252b6bfe853dfc1ddedf357073716
2019-09-18 17:47:18 +08:00
jinhai b32666a407 Merge branch 'refactor_knowhere' into 'branch-0.5.0'
MS-565 Refactor knowhere

See merge request megasearch/milvus!581

Former-commit-id: 61180414e4319c25e0dcc4af5442233765c6c3ae
2019-09-18 17:40:39 +08:00
xiaojun.lin 59ea536db6 MS-565 1. del wrapper/knowhere
Former-commit-id: 3905da5c0716c6fe8317588c27a61b4a5c36316e
2019-09-18 17:36:47 +08:00
zhiru a5b3dea158 update
Former-commit-id: 3d3617149b664de4d6af554af6e984163b963fe6
2019-09-18 17:30:05 +08:00
xiaojun.lin ed105628fc MS-565 1. refactor dir structure 2. add license 3. del swig
Former-commit-id: 580d35b9fe3ea71ebc7d6096fbf5d905351f34f5
2019-09-18 17:27:18 +08:00
starlord 8e5197a53b add log for table file miss issue
Former-commit-id: 641bc002a5f760e9bd804c99897d0c6c84f07919
2019-09-18 16:41:42 +08:00
jinhai 2a709fdcb8 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
Branch 0.5.0

See merge request megasearch/milvus!574

Former-commit-id: 0baa159eaada35caae20f3f1246b4a2d39527f72
2019-09-18 15:56:35 +08:00
zhiru b364c8e3a7 update
Former-commit-id: 034185feb37416994a52ddf14a30daa06c886f14
2019-09-18 15:51:17 +08:00
zhiru 8464b8a206 refactor cmake
Former-commit-id: 587cc22f501fd12cbdaf2d9950fce3f2483c7020
2019-09-18 15:49:47 +08:00
Yu Kun 795ed3cf8e Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: 39277e83cae742e3b2b7dc288f516a833e89a38b
2019-09-18 15:34:55 +08:00
Yu Kun e852816176 fix memory leak
Former-commit-id: 397a13f633b1b120c516db97ed46e5c8836db1ce
2019-09-18 15:34:47 +08:00
jielin.xu 554c1808d5 Update README.md
Former-commit-id: 5843202bb1d4083ab1ed802f1aa3cd730a63d1d9
2019-09-18 15:17:04 +08:00
zhiru 80dbaebde3 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: 73c08f0a1c4bb6913ea026c011bcb4dc9037e369
2019-09-18 15:11:03 +08:00
starlord 8eaf03a279 refine code
Former-commit-id: 710c122428d52f56a7bf41903afa4a7f8c6db01e
2019-09-18 15:05:51 +08:00
starlord cc02093029 Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: 2a518240fd2f4e4fbdcb8a653f98d6520fa79315
2019-09-18 12:49:38 +08:00
starlord 69ce92dcc5 MS-558 refine status code
Former-commit-id: ebb5ec55a58cfce4385f39d186e86d858eab1bf0
2019-09-18 12:49:29 +08:00
zhiru e7b8b32617 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: 5d9c7b3b3f5c91939321c7d59a481ea085f9f553
2019-09-18 11:29:37 +08:00
wxyu 5a2743946b MS-562 Add JobMgr and TaskCreator in Scheduler
Former-commit-id: bbaf2b649843e86fc7bbd28ec61e5a990fc5951f
2019-09-18 10:42:01 +08:00
zhiru 51055a29f3 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: ce5580ff84fecbcc1872ce6cf74a981af5ed98d9
2019-09-18 10:27:26 +08:00
jielin.xu 918f299c69 Update README.md
Former-commit-id: bf982801e6f7b3b82ff6ae1af98b66a29bf8b55c
2019-09-17 18:57:14 +08:00
jielin.xu 0f955f5183 Update README.md
Former-commit-id: 9a58a8165f60984fb06ba98f863c571989052dde
2019-09-17 18:56:33 +08:00
jielin.xu edd566b046 Update CHANGELOG.md
Former-commit-id: d822441834b09e510ed386ee64f436ac6c15e6af
2019-09-17 18:53:43 +08:00
jielin.xu a5ad6a19ed Update CHANGELOG.md
Former-commit-id: df346c406bdecbf100761b5aa3de710ba8325a46
2019-09-17 18:49:58 +08:00
starlord e16ac72a25 MS-558 refine status code
Former-commit-id: cb176cf273ec66e1f7f5e89e9ba4c39cabc511ea
2019-09-17 17:37:31 +08:00
jielin.xu 3cea080566 Add new file
Former-commit-id: a07c10c27a7ca33125b7fb3c4634f3dd24317905
2019-09-17 14:39:43 +08:00
jielin.xu 17792a37ae Update README.md
Former-commit-id: 625e0ce886fdb20c072e136364b6652517c1bb65
2019-09-17 14:31:17 +08:00
jielin.xu 7941aa5caf Update README.md
Former-commit-id: 7b155725e3407f47c6432ce0d678a1c783b29ed8
2019-09-17 14:29:04 +08:00
jielin.xu fa9b470ddf Update CONTRIBUTING.md
Former-commit-id: 91a46fa2630cbcd50cdd35168449d474dcb36337
2019-09-17 14:25:31 +08:00
jielin.xu 359a71de5a Update CONTRIBUTING.md
Former-commit-id: 17c0b8e8ac44b035ed441c91a661b60e870d56db
2019-09-17 14:23:31 +08:00
jielin.xu 9753941651 Add new file
Former-commit-id: 718692a49171c7bb36219dbbd0db024427b40904
2019-09-17 14:15:42 +08:00
zhiru c5d0a6e5ae Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: 3d8b3c771fecc82184ac5051e39fb5e61353ad24
2019-09-17 14:14:17 +08:00
zhiru 49f80d3cb7 update main CMakeList
Former-commit-id: 68124f2a284c90ef72edc07d530e88fa67a7ed6a
2019-09-17 14:14:15 +08:00
starlord 5f07962cd4 MS-557 merge Log.h
Former-commit-id: 37a1aece83b0885aef1ad60fbd3b26805df57a54
2019-09-17 11:07:39 +08:00
starlord 9d53224b6a MS-557 merge Log.h
Former-commit-id: 0fb5985bc71132307d66eea85c098d3518935c8c
2019-09-17 11:06:26 +08:00
starlord b77155f3ec merge Log.h
Former-commit-id: 3de21b82b857b7601075b977792ffdd36638e800
2019-09-17 11:05:09 +08:00
wxyu 909e2a0934 add Apache License
Former-commit-id: 8afccd9400189249b2f0c797e6e0f53f74547246
2019-09-17 10:59:51 +08:00
wxyu 6cbf62c35f Merge remote-tracking branch 'main/branch-0.5.0' into branch-0.5.0
Former-commit-id: 3b0b477ac496700e63f0ecf51fed63d100f2bd24
2019-09-17 10:58:01 +08:00
starlord 63bd4cca5c merge Log.h
Former-commit-id: 1204cfbfddee0b863abf10874ef97f0581c36a9a
2019-09-17 10:57:41 +08:00
wxyu dc559ef2ca solve conflicts
Former-commit-id: 42e851d305e116053bc8cbf57dffc4161e66bc48
2019-09-17 10:55:46 +08:00
wxyu af9c167ed0 MS-556 Add Job Definition in Scheduler
Former-commit-id: 87787757226f3b397d65125a687442222a5d3532
2019-09-17 10:54:51 +08:00
jinhai 9433bf81cc MS-554 Change license to apache 2.0
Former-commit-id: e09b7dd7872372fa0ece9f5d18ec4c316b89cbe8
2019-09-17 10:51:48 +08:00
starlord 650d43dd4e update changelog
Former-commit-id: 9aefaa8682dbe383b7fdf75b4edeb6332bf36019
2019-09-17 10:16:37 +08:00
starlord ef37fc9702 Merge branch 'branch-0.4.0' into 'branch-0.5.0'
refine cache code

See merge request groot/vecwise_engine!4

Former-commit-id: 1baa0f3ce6bb90667f090e2ee76f5c168a4ca76d
2019-09-17 10:01:27 +08:00
starlord 49c3b8e9f6 refine cache code
Former-commit-id: 9d74c7f97e3bca9bb43963ed6f05491e258b712c
2019-09-17 09:55:25 +08:00
Heisenberg 8fdef361b1 change cmakelist
Former-commit-id: 9a60b9fb71226b5b15e7bb2b755ff2ad53e6d922
2019-09-16 20:18:18 +08:00
Heisenberg 785a75a121 MS-552 Add and change the easylogging library
Former-commit-id: cc29d15a956a343622f1f17c63b1ada51bb172a5
2019-09-16 20:08:46 +08:00
starlord 5c36b1a052 refine cache code
Former-commit-id: 2a982ed5663a5e34c46d8a3be2bb5c875ee6b63a
2019-09-16 15:46:58 +08:00
jinhai 56737a2f88 Update CHANGELOGS
Former-commit-id: 7441da96c79fb2cf89ac9ad2839ea45d3a9a5bdb
2019-09-12 18:57:06 +08:00
jinhai 06433d879e Merge branch 'branch-0.4.0' into 'branch-0.4.0'
Update lockguard

See merge request megasearch/milvus!565

Former-commit-id: cbb039c1da725a1c8ce0c8d06150749a6157ded7
2019-09-12 17:59:32 +08:00
jinhai 73ee2e0a7b Update lockguard
Former-commit-id: 1bdcd84679433929e582689661730f1359077c98
2019-09-12 17:58:18 +08:00
jinhai 66a3b8f420 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
Branch 0.4.0

See merge request megasearch/milvus!564

Former-commit-id: 2bcae89add594fb171fa9c5b4cce3366f4373237
2019-09-12 17:29:56 +08:00
jinhai 8c9bbc4467 Fix compile error
Former-commit-id: 2fb38500e2c534d1ddfeca123675c2f425efb2a4
2019-09-12 09:29:09 +00:00
jinhai f6065c997f Merge branch 'branch-1.4.0' of http://192.168.1.105:6060/jinhai/milvus into branch-0.4.0
Former-commit-id: 3f0e61ba1722063655c8b35870ca5e0a12e5ce9e
2019-09-12 09:24:16 +00:00
jinhai bb0bee5368 Fix boost url
Former-commit-id: 323f1456f38a0adb468a53b8df0599a016e19b93
2019-09-12 17:23:30 +08:00
jinhai bf9e1d7073 Merge branch 'branch-1.4.0' of http://192.168.1.105:6060/jinhai/milvus into branch-0.4.0
Former-commit-id: aa587bd63672ba5bec583eba3f4737142af02f0d
2019-09-12 09:13:18 +00:00
jinhai ca53a98c55 Add merge mutex
Former-commit-id: 3e65e9a3195ec1eff635b17997b599dbca1a0457
2019-09-12 17:11:02 +08:00
starlord 8003b709d2 fix scheduler unittest error
Former-commit-id: 65a76790634a63b3777aa79f038ea61f6fdf546f
2019-09-12 17:06:41 +08:00
peng.xu da99a9e1f0 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
fix build index error

See merge request megasearch/milvus!562

Former-commit-id: 3f42a54ffa04c2f8c53ff6228e982fac8281b4fd
2019-09-12 16:23:44 +08:00
starlord 2175893f54 Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
Former-commit-id: d93a861e1171c298fe2d7d4cb8dd8e499b1ac3a8
2019-09-12 16:23:02 +08:00
starlord 193d0eeb6d fix build index error
Former-commit-id: 593aeb2482792bfef55fbec8e6480df498cf9708
2019-09-12 16:22:21 +08:00
jinhai 221a3134a1 Merge branch 'ms549' into 'branch-0.4.0'
MS-549 server crash when search and train on same gpu

See merge request megasearch/milvus!561

Former-commit-id: 949cd52836c801888f352fef96d7cff2022a9ca1
2019-09-12 15:48:26 +08:00
yudong.cai 25a78bb9b1 MS-543 send error status to sdk when load index fail
Former-commit-id: eee5d755dc706d176a0d0a29db17ba29ebb6aa37
2019-09-12 15:42:46 +08:00
xj.lin c9aff1ebab MS-549 server crash when search and train on same gpu
Former-commit-id: b285b816dac478e3940a5dac38bd45c7b13da578
2019-09-12 15:33:46 +08:00
yudong.cai f136df4aaa MS-543 send error status to sdk when load index fail
Former-commit-id: a62922b904c7f7d478f5211b4d215d387ea23ae2
2019-09-12 14:10:56 +08:00
peng.xu cb332598d9 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-546 Add simple mode resource_config

See merge request megasearch/milvus!558

Former-commit-id: 79f3420f07aedde4897c718498cc3ec7d1be463b
2019-09-12 12:05:27 +08:00
wxyu c569f8acf5 solve conflicts
Former-commit-id: 9d12c13ad3b65384e6f566f83655b0d85028312f
2019-09-12 12:04:47 +08:00
Yu Kun 9583b9da64 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 3a06caa572c2732c4e9da3e5b10cd18900225fc1
2019-09-12 11:57:22 +08:00
Yu Kun 4223ad9dc2 fix searchinfiles return status bug
Former-commit-id: f7d2490eb6eebf366d4130e5b48adcaab6e41020
2019-09-12 11:56:37 +08:00
wxyu 0f6a6fe14d MS-546 Add simple mode resource_config
Former-commit-id: 13c594c3db06dc998af041ccb85d78d92a5e8fbf
2019-09-12 11:49:32 +08:00
wxyu 54ec2a126d MS-546 Add simple mode resource_config
Former-commit-id: d1909071f0d5e630ae8919c473083cad04778d76
2019-09-12 11:48:45 +08:00
starlord 012d1df09f Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
Former-commit-id: 50170cbe70ef0111ab5c81a8472e5fee5a1ec708
2019-09-12 11:39:55 +08:00
Yu Kun 8c06e4e2e3 remove some nouse changes
Former-commit-id: 9b09de4cdb409f5327db7ce8966b0974eed1d3fa
2019-09-12 11:35:15 +08:00
Yu Kun ddfc052223 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 1086979d1883a172a96f99ad5d6d03aa6b61e3f1
2019-09-12 11:30:55 +08:00
peng.xu 9998adb305 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
remove gpu_cache_capacity config

See merge request megasearch/milvus!555

Former-commit-id: 684259254218b9c02a3fdaa67ffadd3dca7efc0e
2019-09-12 11:30:25 +08:00
Yu Kun 9f832656a0 fix conflicts
Former-commit-id: 5bf67736ef9c4a6dc505899a2bf5cb289c3c5aa5
2019-09-12 11:28:20 +08:00
starlord d95417f793 Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
Former-commit-id: 82145d3269bdda9f17993aa75c2308faf949c74c
2019-09-12 11:27:32 +08:00
starlord a7ea9b2817 remove gpu_cache_capacity config
Former-commit-id: 94abdd662201c9b19c79d7b7170f3e9af2c39e81
2019-09-12 11:27:19 +08:00
starlord b92d489709 remove gpu_cache_capacity config
Former-commit-id: 34cd12b8f13d4d92517cd6c5aa94fa8aa0c1cd66
2019-09-12 11:25:21 +08:00
Yu Kun d6c314b9e6 fix conflicts
Former-commit-id: aa97e1f8864d9cf3c48c41b3670a0f315019350c
2019-09-12 11:18:11 +08:00
Yu Kun a2504c13e3 fix coverage bugs
Former-commit-id: 6fd2ca73cc082164c2e44301797cbade85fbe218
2019-09-12 11:15:02 +08:00
jinhai 26c8011294 Change type
Former-commit-id: da3ae3ff25ac26dd1c85a52bd8ddc5538dd42fbd
2019-09-12 10:51:56 +08:00
jinhai 457c43a9f4 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 316fb37455523a04270b87ba49824a4ef3352abe
2019-09-12 10:31:31 +08:00
Yu Kun 4cd641058f remove some nouse changes
Former-commit-id: c550390a97917b975fe456a733efda7d5b17c099
2019-09-11 21:26:35 +08:00
Yu Kun 6625cc1a81 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: e59c248d2b525fe480a3b5ba97c6acc6e63d0c45
2019-09-11 20:42:01 +08:00
Yu Kun 6c90546ee5 fix search status return error
Former-commit-id: f44e97911d38a7aec383ba15d649699ff3b8328f
2019-09-11 20:41:36 +08:00
Yu Kun cc0ce2e49f MS-532 Add grpc server unittest
Former-commit-id: 92368a067cc2a7295f3fd027b576f78789297b52
2019-09-11 20:17:43 +08:00
xj.lin 12dd738e46 MS-544 fix
Former-commit-id: 2d9d4afb74ce2522b8cf5bf29ade982d3d6722ad
2019-09-11 20:16:31 +08:00
Yu Kun 6afd997b7a Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: d918f411479abd408d66ae84741ffb5231ccce42
2019-09-11 19:08:35 +08:00
peng.xu aee725a3f2 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
update config validation

See merge request megasearch/milvus!551

Former-commit-id: 87c1e2b4f6c66b2fe9c89990bf2209bacd7b91ae
2019-09-11 18:52:10 +08:00
zhiru 127fb43bf7 update config validation
Former-commit-id: a0e644700e6c3ce9e443da782019dae276fd4b36
2019-09-11 18:49:55 +08:00
peng.xu a8e971ce3a Merge branch 'branch-0.4.0' into 'branch-0.4.0'
optimize debug log

See merge request megasearch/milvus!550

Former-commit-id: 242a51f50863d23ffdb0a53dd0ca8bbb99e8fb30
2019-09-11 18:31:36 +08:00
yudong.cai 47d98989d0 optimize debug log
Former-commit-id: cf7c5b41a51493072acf68f42649cca532a4d896
2019-09-11 18:28:22 +08:00
starlord 28cc9e459e refine code
Former-commit-id: 1d9e51080453544da5a6032a87618ef944bf3594
2019-09-11 18:01:44 +08:00
Yu Kun 789c6f9e4f Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: c5e7ad8a644fb1bec6ee528e5c5723e3f14f0b04
2019-09-11 17:19:32 +08:00
Yu Kun 7eb3a6b6a3 MS-532 Add grpc server unittest
Former-commit-id: c5fe1f0a5efdface4aaca2e178553c9481991770
2019-09-11 17:19:25 +08:00
starlord a67c928eb3 avoid unittest failure
Former-commit-id: a079455ff123d9121dd1032500564be08e237857
2019-09-11 14:02:55 +08:00
starlord 74d6d518bd refine unittest code
Former-commit-id: 07d66baee30ad9ab130ca3cbc75ca50adcb68865
2019-09-11 11:53:28 +08:00
starlord 1982736a86 refine unittest code
Former-commit-id: 71662b7d99de6fcbbe80b98b82cc704ae3cc9398
2019-09-11 11:37:19 +08:00
starlord 9d8f88febd refine config
Former-commit-id: cffe2a35f6ea8aa2bdcd409825b97980b91c217f
2019-09-11 11:14:51 +08:00
Yu Kun 57aa611988 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 578f5ac9752a682c8079a7e3e298d32d90cd39a3
2019-09-11 11:02:34 +08:00
Yu Kun ca61c45f09 MS-532 Add grpc server unittest
Former-commit-id: 031714ba8543429be0862e5878a20cdfdbb3981c
2019-09-11 11:02:29 +08:00
Heisenberg 395e234daf Merge branch 'branch-0.4.0' into add_unitest
Former-commit-id: c2f38de4a83f3fd9b94f451f3cf1f201ee1c60b9
2019-09-11 10:36:36 +08:00
Heisenberg d804bed0f5 add unit test
Former-commit-id: 7807128ae39dd66c812fa254be840d2c4c7a364e
2019-09-11 10:36:09 +08:00
peng.xu 805b5c29f6 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
fix unitest failure

See merge request megasearch/milvus!545

Former-commit-id: d8e09e13ad3995df18aabc470438b127712e87c9
2019-09-11 10:32:04 +08:00
starlord 563baa52e8 fix unitest failure
Former-commit-id: 8582ebb9772270e41e74e4c582044e6e8b732d77
2019-09-11 10:31:19 +08:00
jinhai c1084e0788 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-540: update server config

See merge request megasearch/milvus!544

Former-commit-id: 84b61016370428345debed0c5c2a773685e1e478
2019-09-11 10:21:28 +08:00
zhiru b76ad6b073 update server config
Former-commit-id: 540f2d12259f922f7eef41e6cda5a29ec19b0197
2019-09-11 10:17:26 +08:00
Yu Kun c98c46d3f0 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: a5c66e27fb41eff47fe0725fd14029a983f3ab62
2019-09-10 21:00:03 +08:00
Yu Kun c5cb0a835d MS-532 Add grpc server unittest
Former-commit-id: 18af543a28ac54c150f11135c88016311e34251b
2019-09-10 20:59:45 +08:00
jinhai 5c8225adfd Merge branch 'ms311' into 'branch-0.4.0'
MS-311 1. error log remove compile address

See merge request megasearch/milvus!543

Former-commit-id: 21094596ab39654d5f3ba9ac460bfc3e6dbece8e
2019-09-10 20:16:06 +08:00
xj.lin 5ca56a1718 MS-311 1. error log remove compile address
Former-commit-id: ff24292efc9765678f880362edffe180d8fb8192
2019-09-10 20:14:58 +08:00
starlord 9665820452 add unitest
Former-commit-id: baa39b21f9095d00ef9c6ee43027d5acd993c54f
2019-09-10 20:09:56 +08:00
starlord 25210886d0 add unitest
Former-commit-id: 4843e1b14fa97b253a155a71ddb02f7c076942c4
2019-09-10 19:59:50 +08:00
jinhai cbd07c18f8 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
update mysql meta test

See merge request megasearch/milvus!541

Former-commit-id: 18d9bbf13cb2f23fc75bb3142f5c21bab9c7d3e4
2019-09-10 19:44:51 +08:00
zhiru c811c3a781 update mysql meta test
Former-commit-id: 5f6d059f81b16ae34354324c16f342c3125c8b92
2019-09-10 19:42:18 +08:00
wxyu 93297ffe5d Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
Former-commit-id: c2a42f8e0cd12ca351c024638c41d56e4f0f22b3
2019-09-10 19:31:45 +08:00
wxyu ded3355538 MS-539 Remove old task code
Former-commit-id: 89d66627b558cb33e5b482520e256b701e5d7868
2019-09-10 19:31:29 +08:00
jinhai 941e4dc83c Merge branch 'update_unittest' into 'branch-0.4.0'
MS-538 1. update kdt unittest

See merge request megasearch/milvus!539

Former-commit-id: eca8fb73f491f73ddc2775a26d0b03db9dc92fe2
2019-09-10 19:12:58 +08:00
xj.lin deb90c2c98 MS-538 1. update kdt unittest
Former-commit-id: a1239af4df964ebae18e4d34f778593c2e982945
2019-09-10 19:09:51 +08:00
Heisenberg 911dac8ee9 changelog stuff
Former-commit-id: f39decca3d75405da88a58ec958a315e9b69b668
2019-09-10 18:47:02 +08:00
Heisenberg 4e28185484 merge the newest code
Former-commit-id: 69be61b7715976b4852881717743e2dc121fbf49
2019-09-10 18:40:34 +08:00
Heisenberg 13d040d88a fix the merge conflict again
Former-commit-id: 3a5d6fbd3eef5164abea957353e41bcb2661a08e
2019-09-10 18:38:50 +08:00
peng.xu e135271b3c Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-507 fix performance issue when set CPU_CACHE to 16 or 64

See merge request megasearch/milvus!536

Former-commit-id: 83f7ee7885f8dce3e291bff02421b25df3a6c012
2019-09-10 18:38:28 +08:00
peng.xu 214b1eff0c Merge branch 'branch-0.4.0' into 'branch-0.4.0'
fix typo

See merge request megasearch/milvus!537

Former-commit-id: 4126025b3aaa4447402654565a9ecefc28533273
2019-09-10 18:37:51 +08:00
starlord 0091a17b91 fix typo
Former-commit-id: 969bcffe71d040a0c6f41bdee4819e341149fc4d
2019-09-10 18:37:18 +08:00
yudong.cai 65d20ae3d8 MS-507 fix performance issue when set CPU_CACHE to 16 or 64
Former-commit-id: 402b5d91a9866c38bc7dd16be1fa22de5a0b6bf8
2019-09-10 18:35:32 +08:00
Heisenberg fc98a3a2d2 fix the merge conflict
Former-commit-id: 187d167cc412129e93cd9eec333e33c74368f370
2019-09-10 18:28:52 +08:00
Heisenberg 63d7157d52 MS-121 The problem that user can't change the time zone
Former-commit-id: f9d90003427694ecc72c2eb1dd1a9f52320a9f26
2019-09-10 18:26:39 +08:00
peng.xu fe966d81cb Merge branch 'branch-0.4.0' into 'branch-0.4.0'
fix typo

See merge request megasearch/milvus!535

Former-commit-id: 0eed3a72713403d48bcce5210d5b3ef0ca398b90
2019-09-10 18:04:23 +08:00
starlord 548ab968a1 fix typo
Former-commit-id: 6d9a5cf97a9a1e489bd1829c6f6bc25d2bcf3164
2019-09-10 18:03:24 +08:00
jinhai 4127debdae Merge branch 'update_unittest' into 'branch-0.4.0'
MS-538 1. update unittest

See merge request megasearch/milvus!534

Former-commit-id: 4c366d53ae63ba78ef3a3cf7c2a7e65f3435ef3b
2019-09-10 17:42:12 +08:00
xj.lin f674561e36 MS-538 1. update unittest
Former-commit-id: 38fefd469b3b69ccdcbfb3c741002d8e4703c702
2019-09-10 17:40:16 +08:00
starlord 3ef93cd727 fix unitest failure
Former-commit-id: 1acf7b54ff62304aa2a74f20447a8b37c735ebbd
2019-09-10 16:16:50 +08:00
Yu Kun 4f55c80376 fix conflicts
Former-commit-id: f7a27268673c3544a75eee494e7c612c76c38384
2019-09-10 14:25:02 +08:00
Yu Kun ac3ad3d5da MS-532 Add grpc server unittest
Former-commit-id: 0bd3d8e3cd77ef72c3220747146d0fad47ef6e94
2019-09-10 14:24:12 +08:00
starlord ae20895ed2 Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
Former-commit-id: 6cf400369bd52a33e71668e929f36dc2fbd3506b
2019-09-10 12:42:59 +08:00
starlord 251e9b38cd fix unitest failure
Former-commit-id: ed52c067ac2f4ca76e956f5f8afd3b8bda36bd9c
2019-09-10 12:42:51 +08:00
jinhai 7a16cb91c1 Print log
Former-commit-id: 5ccaed23bdb8446a7b4116ae46e0d7fb73fb2154
2019-09-10 12:10:14 +08:00
zhiru 55f27dee7c Config file validation
Former-commit-id: 1590db61ab823d9b4b142e2d4476d2ff8bd8c2ed
2019-09-10 10:59:20 +08:00
starlord 08ed782a6e fix unitest failure
Former-commit-id: 21ed773255ced64c264ab998058a27dd6f0d36bb
2019-09-10 10:32:33 +08:00
starlord b47abd51ba add unitest case
Former-commit-id: 2bb2413e846d69ee768be4f41de0f0d7f9bf300d
2019-09-10 09:28:38 +08:00
jinhai 3d20ee2c42 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
Fix compile error

See merge request megasearch/milvus!528

Former-commit-id: 76e4d3244424a8ca1ce89ee7cbfcc6caf0d13447
2019-09-09 20:54:39 +08:00
jinhai f0abc41871 Fix compile error
Former-commit-id: 5b3ce8f27de195d12d39a3ada0144a1d1047df67
2019-09-09 12:53:49 +00:00
zhiru 72f3bb6414 Config file validation
Former-commit-id: 1fc9b78d356da8ee05df4e9aa9189604daaf1670
2019-09-09 20:53:47 +08:00
zhiru 9f739a9399 Config file validation
Former-commit-id: a49c32a0b5a9736e0151a5054cd9a10fd8828bae
2019-09-09 20:52:11 +08:00
jinhai 5286d988dd Merge branch 'MS-119_log_file_question' into 'branch-0.4.0'
MS-119 The problem of combining the log files

Closes MS-119

See merge request megasearch/milvus!521

Former-commit-id: 0be6356af88683292e04f57e63915181b7d62147
2019-09-09 20:34:55 +08:00
jinhai de50118557 Merge branch 'fix_gpuresource' into 'branch-0.4.0'
MS-534 1. fix

See merge request megasearch/milvus!526

Former-commit-id: 25d59b37fa34902ba9a3bfe607e4f35110580571
2019-09-09 20:33:59 +08:00
Heisenberg d94945a999 Merge branch 'branch-0.4.0' into MS-119_log_file_question
Former-commit-id: 765c98b91bf45617613568feed360b8dbc3ecc47
2019-09-09 20:28:33 +08:00
Heisenberg 8f2d7afd87 recover the template file
Former-commit-id: 8dd1549bc628c7567ca33c659bb3508a5877528a
2019-09-09 20:27:58 +08:00
xj.lin 6dd89bb0a4 MS-534 1. fix
Former-commit-id: 6d1927610d68cdb2689070699e42851223ee67d9
2019-09-09 20:27:10 +08:00
Heisenberg c54247c247 change the code under suggestions
Former-commit-id: e4bb750aa14b6405c6af434239f71037a7de2744
2019-09-09 20:27:10 +08:00
Yu Kun 2626f70198 MS-532 Add grpc server unittest
Former-commit-id: 41f4497aeb0572f43c320e473d8640a655fcbae2
2019-09-09 20:17:01 +08:00
wxyu 2a847426ac Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
Former-commit-id: 82378ddc8c22d21dcad704ac40528ba32c8aad2e
2019-09-09 20:16:45 +08:00
wxyu 002fd9fdea MS-533 Update resource_test to cover dump function
Former-commit-id: 01e59ea5d95d3ea72a9ec0f7ed2caaaf62e21279
2019-09-09 20:16:34 +08:00
Yu Kun c010422124 MS-532 Add grpc server unittest
Former-commit-id: d2c68090955ef147480de31c9022dcb2dc928e40
2019-09-09 20:15:43 +08:00
jinhai 5c9145aeb7 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
Fix memory double free issue due to random_device

See merge request megasearch/milvus!524

Former-commit-id: 970d947cb84c3317333e7229d1d0c3259623bc71
2019-09-09 20:11:31 +08:00
jinhai e58c223ad5 Fix memory double free issue due to random_device
Former-commit-id: 371a536cd0e80736d9333cff4178a6785097c87e
2019-09-09 12:02:31 +00:00
jinhai 385225c7a8 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-531 Disable next version code

See merge request megasearch/milvus!523

Former-commit-id: dcdb5abe78aec0903e61744e4d18ab7d0b523ba0
2019-09-09 19:41:51 +08:00
wxyu 57eabe260f MS-531 Disable next version code
Former-commit-id: d4148022dd1c10a8c9da0c2119e359cc37e4f53f
2019-09-09 19:35:32 +08:00
starlord 7bb2d98fe2 reduce unittest run time
Former-commit-id: d643a9bdc49bc704cf6e9e6994776b22270476e7
2019-09-09 19:22:53 +08:00
starlord ab163356a9 Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
Former-commit-id: d1b9d0877742427d050cac21bbe4da88126f0a6c
2019-09-09 19:20:49 +08:00
Heisenberg a823d6e4bf fix the changelog merge conflict
Former-commit-id: e3032f4d47c793365de5bce0f49d790c7b3c82ba
2019-09-09 19:17:50 +08:00
Heisenberg a641bb4bb3 MS-119 The problem of combining the log files
Former-commit-id: b3ade33ab3348ef3108c60faa62e8e3239ad5a00
2019-09-09 19:15:27 +08:00
wxyu 67c057e782 Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
Former-commit-id: 17c8212358d8e19cd3a6381469530e76818feda8
2019-09-09 19:13:39 +08:00
wxyu 2af41317e6 MS-530 Add unittest for SearchTask->Load
Former-commit-id: dff97021943c200ca003d766af221c008e5f0ac2
2019-09-09 19:13:30 +08:00
wxyu 082867e10c MS-530 Add unittest for SearchTask->Load
Former-commit-id: d39c7deee2591f9c7a6a2f330298327cfa48277d
2019-09-09 19:13:19 +08:00
starlord d5caefd334 addd unittest for ExecutionImpl
Former-commit-id: 67a0c021813a1588ba6779a14bca33de337a9bbf
2019-09-09 17:59:52 +08:00
starlord d089b9d2af MS-529 incorrect message
Former-commit-id: 2e0c64b0ad9330e53ba185f95f85c128c456e050
2019-09-09 17:58:48 +08:00
jinhai 724be3dae0 Merge branch 'add_unittest' into 'branch-0.4.0'
MS-526 1. Fix knowhere unittest again

See merge request megasearch/milvus!519

Former-commit-id: a8daadff8b8389bf7a68d3e19424117dc354c7ce
2019-09-09 17:16:28 +08:00
xj.lin f49d7bd105 MS-526 1. Fix knowhere unittest again
Former-commit-id: 1331f1b1b43571b577b3d55abd7802659f621819
2019-09-09 17:15:46 +08:00
peng.xu 88a625e629 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-528 Hide some config used future

See merge request megasearch/milvus!518

Former-commit-id: 5196fe024eacdea6aad9cef2a1f3e0d1f508b16b
2019-09-09 16:00:03 +08:00
wxyu 28f9fba041 MS-528 Hide some config used future
Former-commit-id: 196031ea29c7328291476429dfda7455f9e284c8
2019-09-09 15:57:02 +08:00
wxyu 51a0484593 MS-527 Update scheduler_test and enable it
Former-commit-id: b8b44babf6c043a13b6e2800f8ad37cfd264dc89
2019-09-09 15:27:26 +08:00
peng.xu ace2d9fc85 Merge branch 'add_unittest' into 'branch-0.4.0'
MS-526 1. Fix knowhere unittest

See merge request megasearch/milvus!517

Former-commit-id: 948cfc7a2378f88670512732f064742b353392e1
2019-09-09 15:23:51 +08:00
xj.lin f333368663 MS-526 1. Fix knowhere unittest
Former-commit-id: 7b854a453e24fc284219392b4ba96cd0dc034110
2019-09-09 15:21:59 +08:00
wxyu 6375003116 MS-525 Disable parallel reduce in SearchTask
Former-commit-id: d5a39b47988f8d98cd31f3b5d5801d19dfc3f249
2019-09-09 14:59:42 +08:00
wxyu f00a5a11fa Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
Former-commit-id: 7b28c30b2b49f448383357a889419ab18596e86e
2019-09-09 14:31:51 +08:00
wxyu 7b839d4530 MS-524 Add some unittest in event_test and resource_test
Former-commit-id: 7ed6988953724f2105da11ffaa4254c0276955d7
2019-09-09 14:31:41 +08:00
peng.xu 2c9895b0ac Merge branch 'branch-0.4.0' into 'branch-0.4.0'
refine code

See merge request megasearch/milvus!515

Former-commit-id: f22fbb79ed5a3f7e2681b865a3b243ebb22fedcc
2019-09-09 14:17:07 +08:00
starlord 437b1023a6 refine code
Former-commit-id: afbdd941bd653fa5958044a694f0db3d90b63401
2019-09-09 14:14:04 +08:00
peng.xu e8a6b05baf Merge branch 'branch-0.4.0' into 'branch-0.4.0'
add testcase for meta

See merge request megasearch/milvus!514

Former-commit-id: ae84c01e729587ad0b3b5c001caa50e8117d32bd
2019-09-09 12:43:17 +08:00
starlord ded5dbf962 add testcase for meta
Former-commit-id: 3e4df983fd97bfd8cae1571393e217ff8fc200e6
2019-09-09 12:42:40 +08:00
wxyu bf52f6ec45 Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
Former-commit-id: 65dff7b2ae36eb956766bad30010360b9212a02e
2019-09-09 10:03:10 +08:00
wxyu d430ae67b9 MS-520 Update resource_test in scheduler
Former-commit-id: ef511cdbf9ec9dbbde44dc143b5c8a0d8e41b4e4
2019-09-09 10:03:01 +08:00
wxyu 172b805076 MS-519 Add event_test in scheduler
Former-commit-id: cf8b0b8119de8eb6a8b9969e45322115680f7eba
2019-09-09 09:54:30 +08:00
jinhai b1a394ac6e MS-515 & MS-516 Fix index building gpu config issue
Former-commit-id: 50656bfaac7aba28682c4e5d2dbdec5b1c48244a
2019-09-08 10:44:02 +08:00
jinhai c4058c3877 MS-515 & MS-516 Fix index building gpu config issue
Former-commit-id: 14d56eef1f177ebcb24eb6b3186cdc2878dd80b4
2019-09-08 10:41:25 +08:00
jinhai 7b2a668b3c Solve several issues
Former-commit-id: 5845ca6192a563f46d1d3183670b02e32961dcbe
2019-09-07 12:55:10 +00:00
wxyu 9a16867b8b Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
Former-commit-id: d8df294b4af67d6f02ed308aff3fc3552ec13d41
2019-09-07 19:26:22 +08:00
wxyu 0061c5ed6c MS-518 Add schedinst_test in scheduler
Former-commit-id: cda00b76b0e2f43513844fb1a11413b135fa3be3
2019-09-07 19:26:03 +08:00
starlord c1a91ac2d1 refine unittest code
Former-commit-id: 4d9a2330acc0cb7cb7fe663fcb4c2035203bc78b
2019-09-07 19:16:21 +08:00
peng.xu 762c13b1d8 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-510 unittest out of memory and crashed

See merge request megasearch/milvus!509

Former-commit-id: 686a06955ab96505cc7e4a709f58cb0667ce2bda
2019-09-07 18:27:09 +08:00
starlord 3610c91130 MS-510 unittest out of memory and crashed
Former-commit-id: 17e5dd44414299840ccba10ae93ff67d10c80405
2019-09-07 18:26:13 +08:00
wxyu 7ed52edd6e MS-517 Update resource_mgr_test in scheduler
Former-commit-id: 1ec8d4869bb1d863a2bd98d64180d19a77f3313b
2019-09-07 18:14:48 +08:00