380 Commits

Author SHA1 Message Date
peng.xu
813afe7907 add log before bg_error
Former-commit-id: ab002bc46b2758d4061d5a25ff5f301d0f1516d0
2019-07-15 17:30:13 +08:00
starlord
50e4e8a12f MS-207 build_index return success when table not existed
Former-commit-id: de940fd3aedb6492c85bbd6c6a9fdc04731d7ff9
2019-07-15 15:22:39 +08:00
starlord
a01cdbf886 MS-230 - Change parameter name: Maximum_memory to insert_buffer_size
Former-commit-id: 8a27b0b4b272a89a2a1e4e4fa78c26baccaf139d
2019-07-15 13:47:24 +08:00
peng.xu
c22290fff8 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-232: add MySQLMetaImpl::UpdateTableFilesToIndex and set maximum_memory to default if config value = 0

See merge request megasearch/milvus!211

Former-commit-id: 516ab28251dac5743734f50f4a325ca6ee923ca5
2019-07-15 12:00:36 +08:00
zhiru
3963c93ded remove mem manager log
Former-commit-id: 886277f2db3f150db9475a9ffe490b0bc6d7fc63
2019-07-15 11:58:02 +08:00
zhiru
e950fff672 add MySQLMetaImpl::UpdateTableFilesToIndex and set maximum_memory to default if config value = 0
Former-commit-id: f8943149b9737b2f0107308aa96a7f77acdf9ce4
2019-07-15 11:36:01 +08:00
jinhai
644d2a4ea4 Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: c623a4aba15cdb7e5652ed5029090112ec01e8f1
2019-07-15 10:57:52 +08:00
zhiru
8ca3b33cd8 return AlreadyExist error
Former-commit-id: b80220e68e8a5a53c1a2fef4e90d8a4729a85996
2019-07-15 10:41:22 +08:00
jinhai
98cf0bd1e1 Merge branch 'branch-0.3.1-yuncong' into branch-0.3.1
Former-commit-id: 92f799018746a7b117aa0ec1e4af15b0d13a4c01
2019-07-14 21:13:26 +08:00
starlord
c1b312e257 Fix unittest error
Former-commit-id: 106c17b0afc52ddc577c2bc8262b25dcb23f4902
2019-07-14 16:09:09 +08:00
starlord
753ba5a151 Fix SQ8 row count bug
Former-commit-id: 7cd10610f84b0398b36909d9cc45bcfa2d77487b
2019-07-14 15:18:22 +08:00
starlord
eb14bc0d2d Fix SQ8 row count bug
Former-commit-id: 41749a648567e492bc9a718db9526ed98bb2532a
2019-07-14 11:43:14 +08:00
jinhai
7afa3e46d0 Merge branch 'branch-0.3.1' into branch-0.3.1-yuncong
Former-commit-id: d2e66733c2cbfda1caa3febcc5e7b69c5bdcc2d9
2019-07-14 01:28:17 +08:00
zhiru
9d80667a72 update
Former-commit-id: 142163d37af3a3aab8aa3466f37651d3315ddef5
2019-07-14 00:37:33 +08:00
zhiru
b660b49cb5 use env variable to switch mem manager and fix cmake
Former-commit-id: 30fa1d2ca1721631298ea3233841cc15f45f87f7
2019-07-14 00:35:56 +08:00
zhiru
9d9e46c346 update
Former-commit-id: 45b443d3533ec64f2a029ccdd8cecb1b38142b9b
2019-07-14 00:34:16 +08:00
zhiru
1cf7999f96 Add new mem manager
Former-commit-id: 577ceb1dbbe4b2aa0565f3363a3ca4d495a4f1b6
2019-07-14 00:31:41 +08:00
zhiru
35cd901c3f add mem manager
Former-commit-id: 1efc6fb4b565c7793a8a25904c3e656c6c36762d
2019-07-14 00:27:12 +08:00
zhiru
e96bd671c0 Implemented add and serialize
Former-commit-id: 8bcf593791b3f04c055132aec838c439dec9c3a0
2019-07-14 00:22:38 +08:00
zhiru
f4b5ae43f6 update
Former-commit-id: 1a16b8b1d26c704dc72282087207390adee03d0b
2019-07-14 00:19:39 +08:00
zhiru
ba37fb954c add mem impl
Former-commit-id: 36990028d0a289df532e31e53480dbb16ca0558e
2019-07-14 00:15:50 +08:00
starlord
fc74f013a0 add uiittest for merge result functions
Former-commit-id: 810194f590afbd4b4625840875e1447b464011b0
2019-07-14 00:10:51 +08:00
yu yunfeng
1f6a6458b7 MS-151 Fix topk problem
Former-commit-id: ead499ba9f5f152a6c2f9d0c6e2578f6f3a80f8e
2019-07-14 00:08:00 +08:00
yu yunfeng
e0a6469f8a ADD LOG
Former-commit-id: f8ce9610b58cedf3505afc956e78b656c2152e31
2019-07-14 00:05:52 +08:00
yu yunfeng
e94b70829c acc test
Former-commit-id: 1f6af0b88d5d9d3b70ab5c891e8ce6c3a6f004a1
2019-07-14 00:05:52 +08:00
zhiru
46336733ee update
Former-commit-id: 7e7f7df70a19e58f1c65ec487f2c5624e133ee47
2019-07-14 00:05:47 +08:00
zhiru
5a04f56aad update
Former-commit-id: 5232df1758b4041adf936d8df46fe97ff89668cc
2019-07-14 00:05:47 +08:00
zhiru
65419a157f update
Former-commit-id: 966c56781878a740a8b31f7aeea99ed4dd562de7
2019-07-14 00:05:37 +08:00
zhiru
48626e338c Add new mem manager
Former-commit-id: 639e28832e5dfb1cdbdbc7a47177520a9ad4f60f
2019-07-14 00:04:58 +08:00
zhiru
ad4e841664 add mem manager
Former-commit-id: 88ceef178607ea2e49eec64c533959a077c3e4a2
2019-07-14 00:04:42 +08:00
zhiru
b6d3c66476 Implemented add and serialize
Former-commit-id: 35a61d2fd0fc9c703ec4efbc9fe8399162e79b8e
2019-07-14 00:04:42 +08:00
zhiru
d2f205d148 update
Former-commit-id: 1f59974937316725298b1d328c0a38308a4ce367
2019-07-14 00:04:42 +08:00
zhiru
7d4c2632fb add mem impl
Former-commit-id: d0e652cb4c7454cbe2cf6102622343b5a2eee158
2019-07-14 00:04:42 +08:00
starlord
6207e83000 add uiittest for merge result functions
Former-commit-id: 071b7cd18d8acbd6bd6bdceb7dae9a7cf1d1a86c
2019-07-14 00:04:40 +08:00
zhiru
1c441df72e fix c_str error when connecting to MySQL
Former-commit-id: 6c7b477cac2330c169a076550553dbba7efd533e
2019-07-14 00:00:40 +08:00
zhiru
434ba458cc update
Former-commit-id: 12267838390a1c152994efe234d79bc74e299f75
2019-07-14 00:00:38 +08:00
yu yunfeng
854dfeb85b MS-151 Fix topk problem
Former-commit-id: 40f952e4c6e1ed9f5ca3a300601c51d410c8e86b
2019-07-13 23:54:35 +08:00
yu yunfeng
f185a8b606 ADD LOG
Former-commit-id: 864d502d90f0b5e1b75da7eee8fcafc9a8c305dd
2019-07-13 23:54:35 +08:00
yu yunfeng
a954f7a463 acc test
Former-commit-id: 73a1cf40d4227a8e30fa00c43d67f4483592eccb
2019-07-13 23:53:37 +08:00
zhiru
72a1e54acc update
Former-commit-id: 021df2529cba274cabb92b4e6a1cc77186a2ebf5
2019-07-13 23:53:37 +08:00
zhiru
74b0ab8eb9 update
Former-commit-id: 99808a6e2bf44a240b4f72d5e6aa9b72c887c0fa
2019-07-13 23:53:37 +08:00
zhiru
ad606851fa Disable cleanup if mode is read only
Former-commit-id: 8de4aa4c6c81e4d6840441527c164bb26fe948e4
2019-07-13 23:53:37 +08:00
zhiru
24e533a3a3 Disable cleanup if mode is read only
Former-commit-id: 8bb50a5c070e1f8bb7c73191481a476f08ee7281
2019-07-13 23:53:37 +08:00
yu yunfeng
0d25f30b38 update IVF nprobe
Former-commit-id: d2e93de87f9c8b45551f1453b5c0303508cab0c5
2019-07-13 23:53:15 +08:00
zhiru
925c0d0900 update
Former-commit-id: 2e5ec910257824103ab706b7e71a51ea224acfd4
2019-07-13 23:53:15 +08:00
zhiru
a3a14a1f87 update
Former-commit-id: d9c2609d1e78c194cafb3a0db8d10be3c104ac1b
2019-07-13 23:53:14 +08:00
zhiru.zhu
4d83c24bd7 Revert "Merge branch 'mysql-0.3.0' into 'branch-0.3.0'"
This reverts merge request !143


Former-commit-id: 8099ff77584b0af7a8d39d0c6289e8e31b2120c8
2019-07-13 23:52:51 +08:00
jinhai
aa840917e5 MS-133 Change score to distance
Former-commit-id: b66f48e93fbfe461776055f637b996712c8f5881
2019-07-13 23:51:58 +08:00
zhiru
63a71e04cb update
Former-commit-id: 9690faeda806fb563ed3c2f7a104e9d77b63f92a
2019-07-13 23:50:59 +08:00
starlord
fa4f8643eb add more unitest
Former-commit-id: 92cb23d025f006182a3ab7db2e90bc1639016359
2019-07-13 23:50:23 +08:00