diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9e09af20bbc04e85df83f6a5da6e1659fd65b38..5e98764613569844cf85aa3ffd75bddcd00fbcbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
Please mark all change in change log and use the issue from GitHub
-# Milvus 0.8.0 (2020-04-14)
+# Milvus 0.8.0 (2020-04-15)
## Bug
- \#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
- \#1886 Refactor log on search and insert request
- \#1897 Heap pop and push can be realized by heap_swap_top
- \#1928 Fix too many data and uid copies when loading files
-- \#1930 Upgrade mishards to 0.8.0
+- \#1930 Upgrade mishards to v0.8.0
## Task
diff --git a/core/src/server/web_impl/README.md b/core/src/server/web_impl/README.md
index 7e102caccf58d3bc6c64e4364fa9ef5171e650f2..00db5f053d41298808e09d96fd22318619968eb9 100644
--- a/core/src/server/web_impl/README.md
+++ b/core/src/server/web_impl/README.md
@@ -422,12 +422,21 @@ Creates a collection.
##### Body Parameters
-| Parameter | Description | Required? |
-| ----------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- |
-| `collection_name` | The name of the collection to create, which must be unique within its database. | Yes |
-| `dimension` | The dimension of the vectors that are to be inserted into the created collection. | Yes |
-| `index_file_size` | Threshold value that triggers index building for raw data files. The default is 1024. | No |
-| `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 |
+| Parameter | Description | Required? |
+| ----------------- | ----------------------------------------------------------------------------------------- | --------- |
+| `collection_name` | The name of the collection to create, which must be unique within its database. | Yes |
+| `dimension` | The dimension of the vectors that are to be inserted into the created collection. | Yes |
+| `index_file_size` | Threshold value that triggers index building for raw data files. The default is 1024. | No |
+| `metric_type` | The method vector distances are compared in Milvus. The default is L2. | No |
+
+* Currently supported metrics include:
+ - `L2` (Euclidean distance),
+ - `IP` (Inner Product)
+ - `HAMMING` (Hamming distance)
+ - `JACCARD` (Jaccard distance)
+ - `TANIMOTO` (Tanomoto distance)
+ - `SUBSTRUCTURE` (Sub structure distance)
+ - `SUPERSTRUCTURE` (Super structure distance)
#### Response
@@ -1541,6 +1550,11 @@ For each index type, the RESTful API has specific index parameters and search pa
{"M": $int, "efConstruction": $int}
|
{"ef": $int}
|
+
+ | ANNOY |
+ {"n_trees": $int}
|
+ {"search_k": $int}
|
+
For detailed information about the parameters above, refer to [Milvus Indexes](https://milvus.io/docs/guides/index.md)
diff --git a/shards/README.md b/shards/README.md
index c74c58ac32c7dbb73b56b3fca19781505fc0fa99..e9fd56716ce3881579d8c2285c0dd56202a1621a 100644
--- a/shards/README.md
+++ b/shards/README.md
@@ -54,7 +54,7 @@ Follow below steps to start a standalone Milvus instance with Mishards from sour
3. Start Milvus server.
```shell
- $ sudo nvidia-docker run --rm -d -p 19530:19530 -v /tmp/milvus/db:/opt/milvus/db milvusdb/milvus:0.6.0-gpu-d120719-2b40dd
+ $ sudo nvidia-docker run --rm -d -p 19530:19530 -v /tmp/milvus/db:/opt/milvus/db milvusdb/milvus:0.8.0-gpu-d041520-464400
```
4. Update path permissions.
diff --git a/shards/README_CN.md b/shards/README_CN.md
index 5ee079c72a35314836999c98d8ee08d00faef951..a60ec20d3892c5acbc5e0e0851b1117068b8a25e 100644
--- a/shards/README_CN.md
+++ b/shards/README_CN.md
@@ -48,7 +48,7 @@ Python 版本为3.6及以上。
3. 启动 Milvus 服务。
```shell
- $ sudo nvidia-docker run --rm -d -p 19530:19530 -v /tmp/milvus/db:/opt/milvus/db milvusdb/milvus:0.6.0-gpu-d120719-2b40dd
+ $ sudo nvidia-docker run --rm -d -p 19530:19530 -v /tmp/milvus/db:/opt/milvus/db milvusdb/milvus:0.8.0-gpu-d041520-464400
```
4. 更改目录权限。
diff --git a/shards/all_in_one/all_in_one.yml b/shards/all_in_one/all_in_one.yml
index 67dd3b5f600985df00f7267d6a533f32f28561dd..9ecf43792e09fa493f4d6b85c33deab012c308f3 100644
--- a/shards/all_in_one/all_in_one.yml
+++ b/shards/all_in_one/all_in_one.yml
@@ -3,7 +3,7 @@ services:
milvus_wr:
runtime: nvidia
restart: always
- image: milvusdb/milvus:0.7.1-gpu-d032920-3cdba5
+ image: milvusdb/milvus:0.8.0-gpu-d041520-464400
ports:
- "0.0.0.0:19540:19530"
volumes:
@@ -13,7 +13,7 @@ services:
milvus_ro:
runtime: nvidia
restart: always
- image: milvusdb/milvus:0.7.1-gpu-d032920-3cdba5
+ image: milvusdb/milvus:0.8.0-gpu-d041520-464400
ports:
- "0.0.0.0:19541:19530"
volumes:
diff --git a/shards/all_in_one/ro_server.yml b/shards/all_in_one/ro_server.yml
index 64725ac02030163ed3e61dcfe6a2bfed508c12b8..00540672ada2b5e2fc9be45af1ef598c295deb59 100644
--- a/shards/all_in_one/ro_server.yml
+++ b/shards/all_in_one/ro_server.yml
@@ -9,7 +9,7 @@
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
# or implied. See the License for the specific language governing permissions and limitations under the License.
-version: 0.2
+version: 0.3
#----------------------+------------------------------------------------------------+------------+-----------------+
# Server Config | Description | Type | Default |
@@ -42,14 +42,19 @@ server_config:
# | Keep 'dialect://:@:/', 'dialect' can be either 'sqlite' or | | |
# | 'mysql', replace other texts with real values. | | |
#----------------------+------------------------------------------------------------+------------+-----------------+
-# preload_table | A comma-separated list of table names that need to be pre- | StringList | |
-# | loaded when Milvus server starts up. | | |
+# preload_collection | A comma-separated list of collection names that need to | StringList | |
+# | be pre-loaded when Milvus server starts up. | | |
# | '*' means preload all existing tables (single-quote or | | |
# | double-quote required). | | |
#----------------------+------------------------------------------------------------+------------+-----------------+
+# auto_flush_interval | The interval, in seconds, at which Milvus automatically | Integer | 1 (s) |
+# | flushes data to disk. | | |
+# | 0 means disable the regular flush. | | |
+#----------------------+------------------------------------------------------------+------------+-----------------+
db_config:
backend_url: sqlite://:@:/
- preload_table:
+ preload_collection:
+ auto_flush_interval: 1
#----------------------+------------------------------------------------------------+------------+-----------------+
# Storage Config | Description | Type | Default |
diff --git a/shards/all_in_one/wr_server.yml b/shards/all_in_one/wr_server.yml
index d13e945b7199cd06b10eb994a965fbd453f24e7e..4127fc9ece392a469079a98c2c1d108852066b00 100644
--- a/shards/all_in_one/wr_server.yml
+++ b/shards/all_in_one/wr_server.yml
@@ -9,7 +9,7 @@
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
# or implied. See the License for the specific language governing permissions and limitations under the License.
-version: 0.2
+version: 0.3
#----------------------+------------------------------------------------------------+------------+-----------------+
# Server Config | Description | Type | Default |
@@ -42,14 +42,19 @@ server_config:
# | Keep 'dialect://:@:/', 'dialect' can be either 'sqlite' or | | |
# | 'mysql', replace other texts with real values. | | |
#----------------------+------------------------------------------------------------+------------+-----------------+
-# preload_table | A comma-separated list of table names that need to be pre- | StringList | |
-# | loaded when Milvus server starts up. | | |
+# preload_collection | A comma-separated list of collection names that need to | StringList | |
+# | be pre-loaded when Milvus server starts up. | | |
# | '*' means preload all existing tables (single-quote or | | |
# | double-quote required). | | |
#----------------------+------------------------------------------------------------+------------+-----------------+
+# auto_flush_interval | The interval, in seconds, at which Milvus automatically | Integer | 1 (s) |
+# | flushes data to disk. | | |
+# | 0 means disable the regular flush. | | |
+#----------------------+------------------------------------------------------------+------------+-----------------+
db_config:
backend_url: sqlite://:@:/
- preload_table:
+ preload_collection:
+ auto_flush_interval: 1
#----------------------+------------------------------------------------------------+------------+-----------------+
# Storage Config | Description | Type | Default |
diff --git a/shards/all_in_one_with_mysql/all_in_one.yml b/shards/all_in_one_with_mysql/all_in_one.yml
index a1d6a199ae46e4b21250441cda1be4252acda82f..dfa71b5d983587e7d989b19b6b63ce5dd335b107 100644
--- a/shards/all_in_one_with_mysql/all_in_one.yml
+++ b/shards/all_in_one_with_mysql/all_in_one.yml
@@ -18,7 +18,7 @@ services:
milvus_wr:
runtime: nvidia
restart: always
- image: milvusdb/milvus:0.7.1-gpu-d032920-3cdba5
+ image: milvusdb/milvus:0.8.0-gpu-d041520-464400
volumes:
- /tmp/milvus/db:/var/lib/milvus/db
- ./wr_server.yml:/var/lib/milvus/conf/server_config.yaml
@@ -29,7 +29,7 @@ services:
milvus_ro:
runtime: nvidia
restart: always
- image: milvusdb/milvus:0.7.1-gpu-d032920-3cdba5
+ image: milvusdb/milvus:0.8.0-gpu-d041520-464400
volumes:
- /tmp/milvus/db:/var/lib/milvus/db
- ./ro_server.yml:/var/lib/milvus/conf/server_config.yaml
diff --git a/shards/all_in_one_with_mysql/ro_server.yml b/shards/all_in_one_with_mysql/ro_server.yml
index 26121d0560b59559033be1fab58d7fd06af4c860..2de7edbed73c3e1c46cc8604ba9d3404660a4cc7 100644
--- a/shards/all_in_one_with_mysql/ro_server.yml
+++ b/shards/all_in_one_with_mysql/ro_server.yml
@@ -9,7 +9,7 @@
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
# or implied. See the License for the specific language governing permissions and limitations under the License.
-version: 0.2
+version: 0.3
#----------------------+------------------------------------------------------------+------------+-----------------+
# Server Config | Description | Type | Default |
@@ -42,14 +42,19 @@ server_config:
# | Keep 'dialect://:@:/', 'dialect' can be either 'sqlite' or | | |
# | 'mysql', replace other texts with real values. | | |
#----------------------+------------------------------------------------------------+------------+-----------------+
-# preload_table | A comma-separated list of table names that need to be pre- | StringList | |
-# | loaded when Milvus server starts up. | | |
+# preload_collection | A comma-separated list of collection names that need to | StringList | |
+# | be pre-loaded when Milvus server starts up. | | |
# | '*' means preload all existing tables (single-quote or | | |
# | double-quote required). | | |
#----------------------+------------------------------------------------------------+------------+-----------------+
+# auto_flush_interval | The interval, in seconds, at which Milvus automatically | Integer | 1 (s) |
+# | flushes data to disk. | | |
+# | 0 means disable the regular flush. | | |
+#----------------------+------------------------------------------------------------+------------+-----------------+
db_config:
backend_url: mysql://root:milvusroot@milvus-mysql:3306/milvus
- preload_table:
+ preload_collection:
+ auto_flush_interval: 1
#----------------------+------------------------------------------------------------+------------+-----------------+
# Storage Config | Description | Type | Default |
diff --git a/shards/all_in_one_with_mysql/wr_server.yml b/shards/all_in_one_with_mysql/wr_server.yml
index e6fa55fbdd1bdccc1c108d3e2baf192ebe3cfed5..40e0b0b71e117eb8d3f89d021eed97bfa810a0e6 100644
--- a/shards/all_in_one_with_mysql/wr_server.yml
+++ b/shards/all_in_one_with_mysql/wr_server.yml
@@ -9,7 +9,7 @@
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
# or implied. See the License for the specific language governing permissions and limitations under the License.
-version: 0.2
+version: 0.3
#----------------------+------------------------------------------------------------+------------+-----------------+
# Server Config | Description | Type | Default |
@@ -42,14 +42,19 @@ server_config:
# | Keep 'dialect://:@:/', 'dialect' can be either 'sqlite' or | | |
# | 'mysql', replace other texts with real values. | | |
#----------------------+------------------------------------------------------------+------------+-----------------+
-# preload_table | A comma-separated list of table names that need to be pre- | StringList | |
-# | loaded when Milvus server starts up. | | |
+# preload_collection | A comma-separated list of collection names that need to | StringList | |
+# | be pre-loaded when Milvus server starts up. | | |
# | '*' means preload all existing tables (single-quote or | | |
# | double-quote required). | | |
#----------------------+------------------------------------------------------------+------------+-----------------+
+# auto_flush_interval | The interval, in seconds, at which Milvus automatically | Integer | 1 (s) |
+# | flushes data to disk. | | |
+# | 0 means disable the regular flush. | | |
+#----------------------+------------------------------------------------------------+------------+-----------------+
db_config:
backend_url: mysql://root:milvusroot@milvus-mysql:3306/milvus
- preload_table:
+ preload_collection:
+ auto_flush_interval: 1
#----------------------+------------------------------------------------------------+------------+-----------------+
# Storage Config | Description | Type | Default |
diff --git a/shards/requirements.txt b/shards/requirements.txt
index 399c6fd8453d14cef24a159a6a3536691fcb2f77..65960e127a5c5a58e575ce901f5e71222b73747d 100644
--- a/shards/requirements.txt
+++ b/shards/requirements.txt
@@ -14,7 +14,7 @@ py==1.8.0
pyasn1==0.4.7
pyasn1-modules==0.2.6
pylint==2.3.1
-pymilvus==0.2.9
+pymilvus==0.2.10
#pymilvus-test==0.3.3
pyparsing==2.4.0
pytest==4.6.3