Commit Graph

1216 Commits (d13b244a466fdc2e1fe6bb2dcfedde7baff815b9)

Author SHA1 Message Date
zhiru d13b244a46 use env variable to switch mem manager and fix cmake
Former-commit-id: 7928c6384045f002fd4bf4367bcf5ab9b5262ac0
2019-07-09 17:15:21 +08:00
zhiru a569f60407 use env variable to switch mem manager and fix cmake
Former-commit-id: adf9686013de429b842e1bc30860b5ebbe4cad2a
2019-07-09 17:09:22 +08:00
zhiru a6180ccea5 use env variable to switch mem manager and fix cmake
Former-commit-id: f433a193e4086600d3a0ca2259e1f65f0d7fbc5b
2019-07-09 17:07:52 +08:00
peng.xu ec394371d0 Merge branch 'add_unittest' into 'branch-0.3.1'
add tbb.so

See merge request megasearch/milvus!174

Former-commit-id: 0314953df71ca11ff2b0d23c56fcf306127bfc9b
2019-07-09 15:51:43 +08:00
xj.lin 4502c9e6f6 add tbb.so
Former-commit-id: 44a9d9485d3f6de2006979c81fe092fa179f5515
2019-07-09 15:50:54 +08:00
peng.xu 5f8b357b95 Merge branch 'add_unittest' into 'branch-0.3.1'
fix build error

See merge request megasearch/milvus!173

Former-commit-id: 95331af7478d44bba3fdfc164cef985f9194c738
2019-07-09 15:10:33 +08:00
xj.lin 94824d55f1 fix build error
Former-commit-id: 83a0e40c4f90a435abe93f46b7e7aefa6b1f2e67
2019-07-09 15:09:08 +08:00
Jeff da7f9afffb Merge branch 'branch-0.3.1' into 'branch-0.3.1'
fix nightly_main_jenkinsfile docker version bug

See merge request megasearch/milvus!172

Former-commit-id: bcb77b7d3c08e9a905b472fcab0cddfa81213b23
2019-07-09 15:07:20 +08:00
quicksilver 838b1d776c fix nightly_main_jenkinsfile docker version bug
Former-commit-id: f7937454b11da5f2c1af63ae0ae221ab25eb1e7a
2019-07-09 15:06:26 +08:00
Jeff 3945913b25 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
add nightly_main_jenkinsfile

See merge request megasearch/milvus!171

Former-commit-id: e829c6ad6f1a1f70cf51c4796da1e14948dae771
2019-07-09 14:31:03 +08:00
quicksilver de7b3333be add nightly_main_jenkinsfile
Former-commit-id: 15122904442d76bd2befb5f683a92f3353fca376
2019-07-09 14:30:00 +08:00
Jeff a3e0800ec9 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
configure git global user information

See merge request megasearch/milvus!170

Former-commit-id: 936b50ed4b3b2cd939fec6b521cceb4777a4642c
2019-07-09 13:48:47 +08:00
quicksilver 2c0f2a9459 configure git global user information
Former-commit-id: a9a17182a1fa22411c7a3bf0c7bb0505550cb333
2019-07-09 13:47:25 +08:00
jinhai 520bacac26 Merge branch 'branch-0.3.1' of http://192.168.1.105:6060/megasearch/milvus into branch-0.3.1
Former-commit-id: 37253d7751f724c515ffb145975af562943f2aaa
2019-07-09 04:45:39 +08:00
zhiru 7ddd982da3 update
Former-commit-id: b21bbf134cf07237466575a2ae7afc4420eb33fe
2019-07-09 04:45:15 +08:00
zhiru 18e0881baf Add new mem manager
Former-commit-id: ef46229de4934de34f144502ce6d8551d4ef38db
2019-07-09 04:45:15 +08:00
starlord 5951755fb9 date range check
Former-commit-id: 10d00dd0be0ccabf933684add78a5c93bc6f8bce
2019-07-09 04:44:50 +08:00
jinhai ee03d36691 MS-176 Update table name length
Former-commit-id: 9280bdd9470730803640f75b962737f3e604501f
2019-07-09 04:44:50 +08:00
jinhai 1db5af5dd2 MS-176 Add create table parameter check
Former-commit-id: 99f768f472c297d453310684c13a02edca0ff90a
2019-07-09 04:44:50 +08:00
zhiru 2ab74af667 add mem manager
Former-commit-id: db1cb126fd931f260c7ecf710e6de043ea0ebeb9
2019-07-09 04:44:50 +08:00
quicksilver 9bb7ccf412 MS-161 - Add CI / CD Module to Milvus Project
Former-commit-id: 55cd0d918a24c97b31f8fb744f9c507c65f819f6
2019-07-09 04:44:50 +08:00
zhiru 97d129fc38 Implemented add and serialize
Former-commit-id: 02d0ec1da6c441ff0c05d9933a487886dfbd0f96
2019-07-09 04:44:50 +08:00
zhiru 8b05eec643 update
Former-commit-id: 85c6aeb5f2a63fda4450232cce723f16c98aece6
2019-07-09 04:44:50 +08:00
zhiru b0e1f1b3f1 add mem impl
Former-commit-id: 8aeddae834ddd1289a9ab574bdb050e3e5377e99
2019-07-09 04:44:50 +08:00
zhiru 2c3128ea9f fix changelog
Former-commit-id: 740326a44c2884f3ba15173c59414bc11e055dc4
2019-07-09 04:44:50 +08:00
zhiru c383b83215 fix changelog
Former-commit-id: d4ece4b4807fee38fe17486d0775d870d3fd2bfc
2019-07-09 04:44:50 +08:00
starlord ea7f4e1da6 add uiittest for merge result functions
Former-commit-id: 7bc823973219f3b0d9b21c5fdc4d78b3adc2a44a
2019-07-09 04:44:50 +08:00
zhiru fbbed892fa fix c_str error when connecting to MySQL
Former-commit-id: 23334aabdfc983f72429f547d813c5341ca352c9
2019-07-09 04:44:50 +08:00
zhiru a464673420 fix c_str error when connecting to MySQL
Former-commit-id: 055a1e26fb253783f9fdfcc0f6f8206ef29455dd
2019-07-09 04:44:50 +08:00
zhiru 42b2f8f3a2 update
Former-commit-id: e041205d3137170f8611b083b4aded90202e4fdd
2019-07-09 04:44:50 +08:00
zhiru 14e5c85071 update
Former-commit-id: f90944d80f2155a4971225fcf61f7b50610aa0fe
2019-07-09 04:44:50 +08:00
starlord 1b5953bd0d reduce unittest time cost
Former-commit-id: 0c97f4623a480616b47f18fb0b72cbc33b393b66
2019-07-09 04:44:50 +08:00
yu yunfeng 84e0c5808a MS-151 Fix topk problem
Former-commit-id: 3f9acd4460ebede7883669147194e32f99d72094
2019-07-09 04:44:50 +08:00
yu yunfeng e2d3935b60 ADD LOG
Former-commit-id: 36614bd9c42406016c746d56482ed987cb9b5bd4
2019-07-09 04:44:50 +08:00
jinhai a66c229efd Remove unused code
Former-commit-id: a8b9985902792c6b8c884a284fe0fad1c6515b3a
2019-07-09 04:44:50 +08:00
yu yunfeng 0bc554cf77 acc test
Former-commit-id: 6f4f38ad3c53df2c06cc5a3ae5f57d75139a51c4
2019-07-09 04:44:50 +08:00
zhiru d87d0977fa update
Former-commit-id: 2561c4f4412eb0f52751d1cbc73e47c9b57652d9
2019-07-09 04:44:50 +08:00
zhiru b787b49799 update
Former-commit-id: bb7cb2df588dc30ead17b5d727099fddb5ee5595
2019-07-09 04:44:50 +08:00
zhiru 3720a6c3e0 update
Former-commit-id: ce55b27987989dda7c1e2dab1f420256f505820c
2019-07-09 04:44:50 +08:00
zhiru 849689dd42 update
Former-commit-id: 8ea7ae4509eb7c6542ccacd925ee5286c2849e00
2019-07-09 04:44:50 +08:00
zhiru 9e8d7e04ca update
Former-commit-id: 7fd5d1f36a59fdaedf0e1fe4892c1e0d88180d16
2019-07-09 04:44:50 +08:00
zhiru 9c9aac92b9 Disable cleanup if mode is read only
Former-commit-id: 2dfd7154e07274db8a06f280217c1c8ce05c0b33
2019-07-09 04:44:50 +08:00
zhiru e8f4a76c9e Disable cleanup if mode is read only
Former-commit-id: 6283a6ce33c7f88f84a8686c6659771af1069206
2019-07-09 04:44:50 +08:00
jinhai 1aa559498b Merge branch 'NewEngine' into 'branch-0.3.2'
MS-137 New engine

See merge request megasearch/milvus!169

Former-commit-id: adf409fedb96628ab9e0df344c34109570f5f56e
2019-07-09 04:43:58 +08:00
xj.lin 015fe06fc4 update...
Former-commit-id: 42b56218b03ac7b8efb479e776ce601e12a45e6c
2019-07-09 04:43:27 +08:00
xj.lin 440e18bb0f MS-137 - Integrate knowhere
Former-commit-id: 67d9be936996437411ac5941c3e322b08a9389bf
2019-07-09 04:26:31 +08:00
jinhai f940d1af30 Merge branch 'mem-0.3.1' into 'branch-0.3.1'
MS-180:  Add new mem manager

See merge request megasearch/milvus!168

Former-commit-id: bf84d3e42c2f6c0c9ffbab6ac2a6a8982167cd4a
2019-07-08 19:16:37 +08:00
xj.lin 92ebfe95d0 update...
Former-commit-id: 6366c5292e1483be5009e46bd273fdb00433fea6
2019-07-08 19:09:18 +08:00
zhiru ed23b7056f update
Former-commit-id: 6edbbf6f4bca89c568c71d5e4bd0de1be84e6137
2019-07-08 15:07:03 +08:00
zhiru 404e1db012 Merge remote-tracking branch 'upstream/branch-0.3.1' into mem-0.3.1
Former-commit-id: 18256c0946e15c41cc7446adc5ee14127c4c1058
2019-07-08 11:14:51 +08:00