Commit Graph

2472 Commits (18666f3b98a665ead49fbaf450982d151361efc9)

Author SHA1 Message Date
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
peng.xu 673d3ba1fd Merge branch 'branch-0.4.0' into 'branch-0.4.0'
avoid unittest crash

See merge request megasearch/milvus!533

Former-commit-id: 02327b3698f2ea73f786cd0b924cb05bf98cc969
2019-09-10 16:18:22 +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 6d6916d09a Merge branch 'branch-0.4.0' into 'branch-0.4.0'
Print log

See merge request megasearch/milvus!532

Former-commit-id: fa6247218737fd5b7d73f3905e0297b0e3e5036d
2019-09-10 12:11:21 +08:00
jinhai 7a16cb91c1 Print log
Former-commit-id: 5ccaed23bdb8446a7b4116ae46e0d7fb73fb2154
2019-09-10 12:10:14 +08:00
jinhai e0ed3cd11a Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-523: Config file validation

See merge request megasearch/milvus!531

Former-commit-id: 324fe160582a8163a87973c03efcd306ae73be99
2019-09-10 11:14:56 +08:00
zhiru 55f27dee7c Config file validation
Former-commit-id: 1590db61ab823d9b4b142e2d4476d2ff8bd8c2ed
2019-09-10 10:59:20 +08:00
peng.xu b42dbcaa7d Merge branch 'branch-0.4.0' into 'branch-0.4.0'
fix unitest failure

See merge request megasearch/milvus!530

Former-commit-id: 6cd07cdc7771f43ab969411672c195dc705d339d
2019-09-10 10:33:07 +08:00
starlord 08ed782a6e fix unitest failure
Former-commit-id: 21ed773255ced64c264ab998058a27dd6f0d36bb
2019-09-10 10:32:33 +08:00
peng.xu 5d71035593 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
add unitest case

See merge request megasearch/milvus!529

Former-commit-id: cd7b7210a51807300d3ab74283e4b65df1a5eeb1
2019-09-10 09:29:23 +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 3c9ab435ed Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-523: Config file validation

See merge request megasearch/milvus!527

Former-commit-id: 85f5e77c20409feb8e1318ab91baaa0c5fb63451
2019-09-09 20:54:20 +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
jinhai 14badd7c14 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-533 Update resource_test to cover dump function

See merge request megasearch/milvus!525

Former-commit-id: 753a1d58cd6a1af4112d011ab950ede92b2c6c20
2019-09-09 20:17:17 +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
peng.xu 08222f9b55 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
add unittest case for ExecutionEngine

See merge request megasearch/milvus!522

Former-commit-id: bf46bece32922f6d0914fb8f990fbfb5b7145df0
2019-09-09 19:29:15 +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
jinhai c2cb745d1e Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-530 Add unittest for SearchTask->Load

See merge request megasearch/milvus!520

Former-commit-id: ad6cabb36c755c2980b70a70c394ee3367c21871
2019-09-09 19:14:32 +08:00