Skip to content

Commit 423098d

Browse files
BossZouBossZou
authored
Update mishards configure files (#1938)
* Update web readme Signed-off-by: Yhz <yinghao.zou@zilliz.com> * [skip ci] update configure files Signed-off-by: Yhz <yinghao.zou@zilliz.com> * [skip ci] rename table to collection Signed-off-by: Yhz <yinghao.zou@zilliz.com>
1 parent 4644007 commit 423098d

File tree

11 files changed

+65
-31
lines changed

11 files changed

+65
-31
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Please mark all change in change log and use the issue from GitHub
44

5-
# Milvus 0.8.0 (2020-04-14)
5+
# Milvus 0.8.0 (2020-04-15)
66

77
## Bug
88
- \#1276 SQLite throw exception after create 50000+ partitions in a table
@@ -34,7 +34,7 @@ Please mark all change in change log and use the issue from GitHub
3434
- \#1886 Refactor log on search and insert request
3535
- \#1897 Heap pop and push can be realized by heap_swap_top
3636
- \#1928 Fix too many data and uid copies when loading files
37-
- \#1930 Upgrade mishards to 0.8.0
37+
- \#1930 Upgrade mishards to v0.8.0
3838

3939
## Task
4040

‎core/src/server/web_impl/README.md‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -422,12 +422,21 @@ Creates a collection.
422422

423423
##### Body Parameters
424424

425-
| Parameter | Description | Required? |
426-
| ----------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- |
427-
| `collection_name` | The name of the collection to create, which must be unique within its database. | Yes |
428-
| `dimension` | The dimension of the vectors that are to be inserted into the created collection. | Yes |
429-
| `index_file_size` | Threshold value that triggers index building for raw data files. The default is 1024. | No |
430-
| `metric_type` | The method vector distances are compared in Milvus. The default is L2. Currently supported metrics include `L2` (Euclidean distance), `IP` (Inner Product), `HAMMING` (Hamming distance), `JACCARD` (Jaccard distance), and `TANIMOTO` (Tanomoto distance). | No |
425+
| Parameter | Description | Required? |
426+
| ----------------- | ----------------------------------------------------------------------------------------- | --------- |
427+
| `collection_name` | The name of the collection to create, which must be unique within its database. | Yes |
428+
| `dimension` | The dimension of the vectors that are to be inserted into the created collection. | Yes |
429+
| `index_file_size` | Threshold value that triggers index building for raw data files. The default is 1024. | No |
430+
| `metric_type` | The method vector distances are compared in Milvus. The default is L2. | No |
431+
432+
* Currently supported metrics include:
433+
- `L2` (Euclidean distance),
434+
- `IP` (Inner Product)
435+
- `HAMMING` (Hamming distance)
436+
- `JACCARD` (Jaccard distance)
437+
- `TANIMOTO` (Tanomoto distance)
438+
- `SUBSTRUCTURE` (Sub structure distance)
439+
- `SUPERSTRUCTURE` (Super structure distance)
431440

432441
#### Response
433442

@@ -1541,6 +1550,11 @@ For each index type, the RESTful API has specific index parameters and search pa
15411550
<td><pre><code>{"M": $int, "efConstruction": $int}</code></pre></td>
15421551
<td><pre><code>{"ef": $int}</code></pre></td>
15431552
</tr>
1553+
<tr>
1554+
<td> ANNOY</td>
1555+
<td><pre><code>{"n_trees": $int}</code></pre></td>
1556+
<td><pre><code>{"search_k": $int}</code></pre></td>
1557+
</tr>
15441558
</table>
15451559
15461560
For detailed information about the parameters above, refer to [Milvus Indexes](https://milvus.io/docs/guides/index.md)

‎shards/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Follow below steps to start a standalone Milvus instance with Mishards from sour
5454
3. Start Milvus server.
5555

5656
```shell
57-
$ sudo nvidia-docker run --rm -d -p 19530:19530 -v /tmp/milvus/db:/opt/milvus/db milvusdb/milvus:0.6.0-gpu-d120719-2b40dd
57+
$ sudo nvidia-docker run --rm -d -p 19530:19530 -v /tmp/milvus/db:/opt/milvus/db milvusdb/milvus:0.8.0-gpu-d041520-464400
5858
```
5959

6060
4. Update path permissions.

‎shards/README_CN.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Python 版本为3.6及以上。
4848
3. 启动 Milvus 服务。
4949

5050
```shell
51-
$ sudo nvidia-docker run --rm -d -p 19530:19530 -v /tmp/milvus/db:/opt/milvus/db milvusdb/milvus:0.6.0-gpu-d120719-2b40dd
51+
$ sudo nvidia-docker run --rm -d -p 19530:19530 -v /tmp/milvus/db:/opt/milvus/db milvusdb/milvus:0.8.0-gpu-d041520-464400
5252
```
5353

5454
4. 更改目录权限。

‎shards/all_in_one/all_in_one.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
milvus_wr:
44
runtime: nvidia
55
restart: always
6-
image: milvusdb/milvus:0.7.1-gpu-d032920-3cdba5
6+
image: milvusdb/milvus:0.8.0-gpu-d041520-464400
77
ports:
88
- "0.0.0.0:19540:19530"
99
volumes:
@@ -13,7 +13,7 @@ services:
1313
milvus_ro:
1414
runtime: nvidia
1515
restart: always
16-
image: milvusdb/milvus:0.7.1-gpu-d032920-3cdba5
16+
image: milvusdb/milvus:0.8.0-gpu-d041520-464400
1717
ports:
1818
- "0.0.0.0:19541:19530"
1919
volumes:

‎shards/all_in_one/ro_server.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
1010
# or implied. See the License for the specific language governing permissions and limitations under the License.
1111

12-
version: 0.2
12+
version: 0.3
1313

1414
#----------------------+------------------------------------------------------------+------------+-----------------+
1515
# Server Config | Description | Type | Default |
@@ -42,14 +42,19 @@ server_config:
4242
# | Keep 'dialect://:@:/', 'dialect' can be either 'sqlite' or | | |
4343
# | 'mysql', replace other texts with real values. | | |
4444
#----------------------+------------------------------------------------------------+------------+-----------------+
45-
# preload_table | A comma-separated list of table names that need to be pre- | StringList | |
46-
# | loaded when Milvus server starts up. | | |
45+
# preload_collection | A comma-separated list of collection names that need to | StringList | |
46+
# | be pre-loaded when Milvus server starts up. | | |
4747
# | '*' means preload all existing tables (single-quote or | | |
4848
# | double-quote required). | | |
4949
#----------------------+------------------------------------------------------------+------------+-----------------+
50+
# auto_flush_interval | The interval, in seconds, at which Milvus automatically | Integer | 1 (s) |
51+
# | flushes data to disk. | | |
52+
# | 0 means disable the regular flush. | | |
53+
#----------------------+------------------------------------------------------------+------------+-----------------+
5054
db_config:
5155
backend_url: sqlite://:@:/
52-
preload_table:
56+
preload_collection:
57+
auto_flush_interval: 1
5358

5459
#----------------------+------------------------------------------------------------+------------+-----------------+
5560
# Storage Config | Description | Type | Default |

‎shards/all_in_one/wr_server.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
1010
# or implied. See the License for the specific language governing permissions and limitations under the License.
1111

12-
version: 0.2
12+
version: 0.3
1313

1414
#----------------------+------------------------------------------------------------+------------+-----------------+
1515
# Server Config | Description | Type | Default |
@@ -42,14 +42,19 @@ server_config:
4242
# | Keep 'dialect://:@:/', 'dialect' can be either 'sqlite' or | | |
4343
# | 'mysql', replace other texts with real values. | | |
4444
#----------------------+------------------------------------------------------------+------------+-----------------+
45-
# preload_table | A comma-separated list of table names that need to be pre- | StringList | |
46-
# | loaded when Milvus server starts up. | | |
45+
# preload_collection | A comma-separated list of collection names that need to | StringList | |
46+
# | be pre-loaded when Milvus server starts up. | | |
4747
# | '*' means preload all existing tables (single-quote or | | |
4848
# | double-quote required). | | |
4949
#----------------------+------------------------------------------------------------+------------+-----------------+
50+
# auto_flush_interval | The interval, in seconds, at which Milvus automatically | Integer | 1 (s) |
51+
# | flushes data to disk. | | |
52+
# | 0 means disable the regular flush. | | |
53+
#----------------------+------------------------------------------------------------+------------+-----------------+
5054
db_config:
5155
backend_url: sqlite://:@:/
52-
preload_table:
56+
preload_collection:
57+
auto_flush_interval: 1
5358

5459
#----------------------+------------------------------------------------------------+------------+-----------------+
5560
# Storage Config | Description | Type | Default |

‎shards/all_in_one_with_mysql/all_in_one.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ services:
1818
milvus_wr:
1919
runtime: nvidia
2020
restart: always
21-
image: milvusdb/milvus:0.7.1-gpu-d032920-3cdba5
21+
image: milvusdb/milvus:0.8.0-gpu-d041520-464400
2222
volumes:
2323
- /tmp/milvus/db:/var/lib/milvus/db
2424
- ./wr_server.yml:/var/lib/milvus/conf/server_config.yaml
@@ -29,7 +29,7 @@ services:
2929
milvus_ro:
3030
runtime: nvidia
3131
restart: always
32-
image: milvusdb/milvus:0.7.1-gpu-d032920-3cdba5
32+
image: milvusdb/milvus:0.8.0-gpu-d041520-464400
3333
volumes:
3434
- /tmp/milvus/db:/var/lib/milvus/db
3535
- ./ro_server.yml:/var/lib/milvus/conf/server_config.yaml

‎shards/all_in_one_with_mysql/ro_server.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
1010
# or implied. See the License for the specific language governing permissions and limitations under the License.
1111

12-
version: 0.2
12+
version: 0.3
1313

1414
#----------------------+------------------------------------------------------------+------------+-----------------+
1515
# Server Config | Description | Type | Default |
@@ -42,14 +42,19 @@ server_config:
4242
# | Keep 'dialect://:@:/', 'dialect' can be either 'sqlite' or | | |
4343
# | 'mysql', replace other texts with real values. | | |
4444
#----------------------+------------------------------------------------------------+------------+-----------------+
45-
# preload_table | A comma-separated list of table names that need to be pre- | StringList | |
46-
# | loaded when Milvus server starts up. | | |
45+
# preload_collection | A comma-separated list of collection names that need to | StringList | |
46+
# | be pre-loaded when Milvus server starts up. | | |
4747
# | '*' means preload all existing tables (single-quote or | | |
4848
# | double-quote required). | | |
4949
#----------------------+------------------------------------------------------------+------------+-----------------+
50+
# auto_flush_interval | The interval, in seconds, at which Milvus automatically | Integer | 1 (s) |
51+
# | flushes data to disk. | | |
52+
# | 0 means disable the regular flush. | | |
53+
#----------------------+------------------------------------------------------------+------------+-----------------+
5054
db_config:
5155
backend_url: mysql://root:milvusroot@milvus-mysql:3306/milvus
52-
preload_table:
56+
preload_collection:
57+
auto_flush_interval: 1
5358

5459
#----------------------+------------------------------------------------------------+------------+-----------------+
5560
# Storage Config | Description | Type | Default |

‎shards/all_in_one_with_mysql/wr_server.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
1010
# or implied. See the License for the specific language governing permissions and limitations under the License.
1111

12-
version: 0.2
12+
version: 0.3
1313

1414
#----------------------+------------------------------------------------------------+------------+-----------------+
1515
# Server Config | Description | Type | Default |
@@ -42,14 +42,19 @@ server_config:
4242
# | Keep 'dialect://:@:/', 'dialect' can be either 'sqlite' or | | |
4343
# | 'mysql', replace other texts with real values. | | |
4444
#----------------------+------------------------------------------------------------+------------+-----------------+
45-
# preload_table | A comma-separated list of table names that need to be pre- | StringList | |
46-
# | loaded when Milvus server starts up. | | |
45+
# preload_collection | A comma-separated list of collection names that need to | StringList | |
46+
# | be pre-loaded when Milvus server starts up. | | |
4747
# | '*' means preload all existing tables (single-quote or | | |
4848
# | double-quote required). | | |
4949
#----------------------+------------------------------------------------------------+------------+-----------------+
50+
# auto_flush_interval | The interval, in seconds, at which Milvus automatically | Integer | 1 (s) |
51+
# | flushes data to disk. | | |
52+
# | 0 means disable the regular flush. | | |
53+
#----------------------+------------------------------------------------------------+------------+-----------------+
5054
db_config:
5155
backend_url: mysql://root:milvusroot@milvus-mysql:3306/milvus
52-
preload_table:
56+
preload_collection:
57+
auto_flush_interval: 1
5358

5459
#----------------------+------------------------------------------------------------+------------+-----------------+
5560
# Storage Config | Description | Type | Default |

0 commit comments

Comments
 (0)