Commit Graph

1382 Commits

Author SHA1 Message Date
peng.xu
43ad4f0587 Merge branch 'xupeng-0.3.1' into 'branch-0.3.1'
change ci build time from 20 to 30

See merge request megasearch/milvus!217

Former-commit-id: 6840235000207bc43ae82613e035ddd494a3bced
2019-07-15 16:00:43 +08:00
peng.xu
732abc72c7 change ci build time from 20 to 30
Former-commit-id: d289352f66750e7b3e4cb8990bc0f46580952c87
2019-07-15 15:55:35 +08:00
Jeff
6205ac4029 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
format jenkins groovy file

See merge request megasearch/milvus!214

Former-commit-id: a941bec3d3da5a68bdf31ff60c669eea4f4facc2
2019-07-15 15:31:23 +08:00
peng.xu
dae5e256b1 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-207 build_index return success when table not existed

See merge request megasearch/milvus!213

Former-commit-id: 9c981e423fd3d2664518f8904a0f5bc4694c04b4
2019-07-15 15:24:15 +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
peng.xu
c857197501 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-230 - Change parameter name: Maximum_memory to insert_buffer_size

See merge request megasearch/milvus!212

Former-commit-id: df366449f62ae29b713edf0b4961ed79c3726ab8
2019-07-15 14:06:11 +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
peng.xu
d333a75215 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
fix index check error

See merge request megasearch/milvus!210

Former-commit-id: eee81fd404efb7d73a8e0d56a2a80e0177d1faa3
2019-07-15 11:13:30 +08:00
starlord
cd9f317747 fix index check error
Former-commit-id: 9b876213adce723cb2da6d4aa40fb33be2a2c54a
2019-07-15 11:10:57 +08:00
quicksilver
b18cb007d2 format jenkins groovy file
Former-commit-id: efd0150eea28f3d2a0bbebe95385ae651081805b
2019-07-15 11:09:19 +08:00
jinhai
3c33d73cb1 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
Branch 0.3.1

See merge request megasearch/milvus!204

Former-commit-id: 776b4ad0582b1f585f1ce311b481426240b39505
2019-07-15 11:00:55 +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
peng.xu
5f3533ba21 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-224: Return AlreadyExist status in MySQLMetaImpl::CreateTable if table already exists

See merge request megasearch/milvus!208

Former-commit-id: 81bc6c31d47ab3b24fac1fd247531d78a58a5753
2019-07-15 10:46:41 +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
zhiru
5d714dfb99 Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: 24485d8457a8bfaaaf858d2aae5ae441456b1bc1
2019-07-15 10:39:00 +08:00
peng.xu
520d4e9d71 Merge branch 'branch-0.3.1-yuncong' into 'branch-0.3.1-yuncong'
Fix unittest error

See merge request megasearch/milvus!207

Former-commit-id: 906107d2a559105a46a2e257af431be85c8287c8
2019-07-15 10:30:06 +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
Jeff
156bddb5b5 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-215 - add milvus cluster CI/CD groovy file

See merge request megasearch/milvus!206

Former-commit-id: 0fd90665710274191be91d0bfce7821582fa2907
2019-07-14 21:52:05 +08:00
quicksilver
f9b0050cdb MS-215 - add milvus cluster CI/CD groovy file
Former-commit-id: 61d3f98595be12a26c8563ee369d0f5526c407e8
2019-07-14 21:50:48 +08:00
Jeff
dbad4133ba Merge branch 'branch-0.3.1-yuncong' into 'branch-0.3.1-yuncong'
Branch 0.3.1 yuncong

See merge request megasearch/milvus!205

Former-commit-id: 7f37cd512159210e3b9ae3cc09a57258f4901ab8
2019-07-14 21:39:11 +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
quicksilver
2abe69ffb5 fix clean up bug
Former-commit-id: 041f4f5f8beb650d9d0277d4745ef0d1b8820866
2019-07-14 21:08:49 +08:00
quicksilver
3c4a2b1586 fix labels error
Former-commit-id: c3e6ca2d5ff47b79e0210f9f5475974cc3e050d9
2019-07-14 20:43:32 +08:00
quicksilver
6cf2f35b7f update test framework image version to v0.2
Former-commit-id: 636d8c5e46852693ae597cc93fad8f60305f0841
2019-07-14 20:23:51 +08:00
peng.xu
d1ccdcd975 Merge branch 'branch-0.3.1-yuncong' into 'branch-0.3.1-yuncong'
Fix small size index build crash

See merge request megasearch/milvus!203

Former-commit-id: ba10219b6de123b427f7a0d1aa957c8d5440d8eb
2019-07-14 16:47:27 +08:00
starlord
46d64af09c Fix small size index build crash
Former-commit-id: d1255df5fc62aa037f4670049cccfbb8a9851732
2019-07-14 16:46:05 +08:00
Jeff
b0a9684aec Merge branch 'revert-cbf819aa' into 'branch-0.3.1-yuncong'
Revert "format clean up stage"

See merge request quicksilver/milvus!2

Former-commit-id: 473be424f84591e2bb06e528960ce3e61c4c40fe
2019-07-14 16:20:03 +08:00
Jeff
6adf568807 Revert "format clean up stage"
This reverts commit f2eb4ca504 [formerly 29cd25f823901ecd46fd174fa26ddb57ef3c3620]

Former-commit-id: 53d31f7f21b81ab8c110f115e2b99e6fd4645519
2019-07-14 16:19:09 +08:00
Jeff
6c13bfdd8a Merge branch 'revert-69a428f9' into 'branch-0.3.1-yuncong'
Revert "fix cleanup bug"

See merge request quicksilver/milvus!1

Former-commit-id: 757c28be65d231b11b398ce66a037268484bc9f9
2019-07-14 16:18:39 +08:00
Jeff
14fb1c408e Revert "fix cleanup bug"
This reverts commit 02fb15b7af [formerly fcdd0de9624858dbaa62280c8fcaad5e37b8c277]

Former-commit-id: ae863c72b256fc2917a4b7ad783e7f43bbbf8e38
2019-07-14 16:18:13 +08:00
peng.xu
de6f0a2bb0 Merge branch 'branch-0.3.1-yuncong' into 'branch-0.3.1-yuncong'
Fix unittest error

See merge request megasearch/milvus!202

Former-commit-id: 5a21dd2e18ebe0ac8664576e8ea7247b82997b75
2019-07-14 16:11:04 +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
peng.xu
f21407c242 Merge branch 'branch-0.3.1-yuncong' into 'branch-0.3.1-yuncong'
Fix SQ8 row count bug

See merge request megasearch/milvus!201

Former-commit-id: 54d3338e6b17b43e7c3624d1e240ca4dda86f6c1
2019-07-14 15:22:24 +08:00
starlord
753ba5a151 Fix SQ8 row count bug
Former-commit-id: 7cd10610f84b0398b36909d9cc45bcfa2d77487b
2019-07-14 15:18:22 +08:00
quicksilver
fdc159c27d fix cleanup bug
Former-commit-id: e1a28efe242625615c79b3a1a2c0f7dc3fc1ace5
2019-07-14 14:53:00 +08:00
quicksilver
8fd3dd219f format clean up stage
Former-commit-id: cbe735d8a052e33816fba943057877135ed7212a
2019-07-14 14:43:47 +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
Jeff
a93c0cdb2a Merge branch 'branch-0.3.1-yuncong' into 'branch-0.3.1-yuncong'
Branch 0.3.1 yuncong

See merge request megasearch/milvus!199

Former-commit-id: 195ae4e9410a0a3a174e18aa7a093d7e2edf0f45
2019-07-14 13:07:15 +08:00
quicksilver
b30cefc5e5 fix milvus single deploy error
Former-commit-id: 4fabf7de507cb7eebbc532d3753c4b10cf0d391d
2019-07-14 12:02:19 +08:00
peng.xu
489d8039dc Merge branch 'branch-0.3.1-yuncong' into 'branch-0.3.1-yuncong'
MS-217 Fix SQ8 row count bug

See merge request megasearch/milvus!198

Former-commit-id: 43f141e0b099dfe34cbbe3b84b8a77befa6e443b
2019-07-14 11:45:31 +08:00