Commit Graph

1021 Commits

Author SHA1 Message Date
zhiru
07d070ca73 update
Former-commit-id: 1c4f73d9eabbbc3bd085ea0e2cabadf54e4785dc
2019-07-17 13:48:29 +08:00
zhiru
eea064a30f update
Former-commit-id: 1c05bc1ae8136ff21aec4c257531a1e9cdbf1fc3
2019-07-17 13:04:30 +08:00
zhiru
ab45ad89a1 update
Former-commit-id: aba27ece245cadb9aff24943c957de29c6af2a00
2019-07-17 13:02:40 +08:00
zhiru
596684261d Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: 6c32d4b6f798ebcf51a18d4957e9d812380a30ff
2019-07-17 12:53:45 +08:00
zhiru
5acd9ac4eb MS-241 MS-242
Former-commit-id: 608b3d0b14834591a55fca324855b7cbbcf34ca5
2019-07-17 12:50:37 +08:00
starlord
51ebdb93a9 increse thrift thread count
Former-commit-id: 33cec22bf8733907c7b6d67b5ff8b8cc28a816f7
2019-07-17 10:44:55 +08:00
zhiru
585b8401dc fix
Former-commit-id: 8076613c56f3eaa959ef5d21e06933bb09f41889
2019-07-16 11:20:45 +08:00
zhiru
049309f833 fix
Former-commit-id: ebf2ae2d41c259da0e3a22864eb30812b177c2de
2019-07-16 10:25:01 +08:00
zhiru
0b84da5101 Add MySQLMetaImpl::HasNonIndexFiles
Former-commit-id: 9db26bc1ecb99c3522f6a4743da75fc3088fbb5e
2019-07-15 20:41:17 +08:00
zhiru
bc5961209b Add MySQLMetaImpl::HasNonIndexFiles
Former-commit-id: 31682c46358678817802ed49dd10327382501c8e
2019-07-15 20:40:03 +08:00
starlord
7b35e2cebe MS-235 Some test cases random fail
Former-commit-id: c77aab33541b0c5da7c3cdc6a080fb47c76bd301
2019-07-15 19:48:11 +08:00
starlord
590efe665a MS-234 Some case cause background merge thread stop
Former-commit-id: 3458b07f4ea8a877cc5ce9739bd5a74daecd1a21
2019-07-15 19:30:24 +08:00
starlord
7d3c60e956 avoid background merge thread stop
Former-commit-id: 9dca4b821b870fa6167ca4e0bab3febe5eb98169
2019-07-15 19:24:20 +08:00
peng.xu
a8368f5846 add more logging for bg_error break
Former-commit-id: 3d3ddbe93c0770968d0ac4f86b82c0a94c0fa341
2019-07-15 18:50:56 +08:00
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
f3c6559a71 MS-207 build_index return success when table not existed
Former-commit-id: 8e0e1a929afe5959f14c9fbe318303c14d6f8c6d
2019-07-15 14:28:12 +08:00
starlord
de09ef53a9 MS-230 - Change parameter name: Maximum_memory to insert_buffer_size
Former-commit-id: 1263b0c2edceb235163c48b34af681c3edb48d16
2019-07-15 13:47:36 +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
50ca5b4bde add MySQLMetaImpl::UpdateTableFilesToIndex and set maximum_memory to default if config value = 0
Former-commit-id: e3dba8250a2b8c28770811e5c202232bb59231c6
2019-07-15 11:37:26 +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
starlord
cd9f317747 fix index check error
Former-commit-id: 9b876213adce723cb2da6d4aa40fb33be2a2c54a
2019-07-15 11:10:57 +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
jinhai
e84affaef7 Merge branch 'branch-0.3.1-yuncong' into branch-0.3.1
Former-commit-id: 34512e807e4a3b399f88b3fef50e80483b9896b8
2019-07-15 10:57:03 +08:00
zhiru
4d51f9a122 Return AlreadyExist status in MySQLMetaImpl::CreateTable if table already exists
Former-commit-id: eb56307b2a6613a90df28fba0f63166745195cc3
2019-07-15 10:45:20 +08:00
zhiru
8ca3b33cd8 return AlreadyExist error
Former-commit-id: b80220e68e8a5a53c1a2fef4e90d8a4729a85996
2019-07-15 10:41:22 +08:00
starlord
2dffb947a9 add more unitest cases
Former-commit-id: 6367f0601b449098514ac4770eb72daa81d91607
2019-07-15 10:29:28 +08:00
starlord
2428ff1160 Fix unittest error
Former-commit-id: 9185fecbe5161694c6b741ad53fdccf89857899a
2019-07-15 09:25:55 +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
46d64af09c Fix small size index build crash
Former-commit-id: d1255df5fc62aa037f4670049cccfbb8a9851732
2019-07-14 16:46:05 +08:00
starlord
db65b9a0b4 Fix unittest error
Former-commit-id: d8dc208227a2904098d899fca71b936a64a528bd
2019-07-14 16:10:17 +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
jinhai
ecedf749a0 Merge branch 'branch-0.3.1-yuncong' into 'branch-0.3.1'
Merge: Add new memory mgr and validation

See merge request megasearch/milvus!200

Former-commit-id: aacab994009e7337f4429a5cf9efe4c690ac0240
2019-07-14 13:11:03 +08:00
starlord
eb14bc0d2d Fix SQ8 row count bug
Former-commit-id: 41749a648567e492bc9a718db9526ed98bb2532a
2019-07-14 11:43:14 +08:00
jinhai
b19b4031b8 Fix building fault
Former-commit-id: 4b82bd7958672d7762aa667845c9eb63a8da789d
2019-07-14 02:11:32 +08:00
jinhai
8103d78fd5 Fix build fault
Former-commit-id: 1c813d1f13c4bfd36d42ad11f21f1fe1bc827f17
2019-07-14 02:08:56 +08:00
jinhai
7c58bd30a2 Remove redefinition
Former-commit-id: 4dd734c7ebffa9a462c641b0e220a62668651859
2019-07-14 01:54:26 +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
446513f004 update
Former-commit-id: cb170ffdc137c7b897792f092f36438de892d0e8
2019-07-14 00:38:21 +08:00
zhiru
8a1af93518 update
Former-commit-id: 3bda5a0b65c0ddf4bce76685e708ea90c951ad8f
2019-07-14 00:38:21 +08:00
zhiru
034d8a6403 update
Former-commit-id: f2172ed1070f1be0fa525781fb1a70e230ea8258
2019-07-14 00:38:19 +08:00
zhiru
9d80667a72 update
Former-commit-id: 142163d37af3a3aab8aa3466f37651d3315ddef5
2019-07-14 00:37:33 +08:00
zhiru
c7d0f49637 fix cmake
Former-commit-id: 70f81e37a82ca2b6e7280d95e65e6c8eb541a577
2019-07-14 00:37:31 +08:00
zhiru
661d1127aa use env variable to switch mem manager and fix cmake
Former-commit-id: 887e191a29d7b88dc646f2d59628e1ca7693841a
2019-07-14 00:35:58 +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