Merge pull request #161 from sahuang/0.8.6

Release 0.8.6

README.md

@@ -15,7 +15,8 @@ The following table shows compatibilities between Milvus and Java SDK.
 
 | Milvus version | Java SDK version |
 | :------------: | :--------------: |
-|     0.10.x     |    0.8.5         |
+|     0.10.5     |    0.8.6         |
+|     0.10.4<br>0.10.3     |    0.8.5         |
 |     0.10.2     |    0.8.4         |
 |     0.10.1     |    0.8.3         |
 |     0.10.0     |    0.8.2         |
@@ -23,9 +24,6 @@ The following table shows compatibilities between Milvus and Java SDK.
 |     0.9.0      |    0.8.0         |
 |     0.8.0      |    0.7.0         |
 |     0.7.1      |    0.6.0         |
-|     0.7.0      |    0.5.0         |
-|     0.6.0      |    0.4.1         |
-|     0.5.3      |    0.3.0         |
 
 ### Install Java SDK
 
@@ -37,14 +35,14 @@ You can use **Apache Maven** or **Gradle**/**Grails** to download the SDK.
         <dependency>
             <groupId>io.milvus</groupId>
             <artifactId>milvus-sdk-java</artifactId>
-            <version>0.8.5</version>
+            <version>0.8.6</version>
         </dependency>
        ```
 
    - Gradle/Grails
 
         ```gradle
-        compile 'io.milvus:milvus-sdk-java:0.8.5'
+        compile 'io.milvus:milvus-sdk-java:0.8.6'
         ```
 
 ### Examples

examples/pom.xml

@@ -25,7 +25,7 @@
 
     <groupId>io.milvus</groupId>
     <artifactId>milvus-sdk-java-examples</artifactId>
-    <version>0.8.5</version>
+    <version>0.8.6</version>
     <build>
         <plugins>
             <plugin>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>io.milvus</groupId>
             <artifactId>milvus-sdk-java</artifactId>
-            <version>0.8.5</version>
+            <version>0.8.6</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>

pom.xml

@@ -25,7 +25,7 @@
 
     <groupId>io.milvus</groupId>
     <artifactId>milvus-sdk-java</artifactId>
-    <version>0.8.5</version>
+    <version>0.8.6</version>
     <packaging>jar</packaging>
 
     <name>io.milvus:milvus-sdk-java</name>
@@ -312,6 +312,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.19.1</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
                 <dependencies>
                     <dependency>
                         <groupId>org.junit.platform</groupId>

src/main/java/io/milvus/client/MilvusClient.java

@@ -347,6 +347,16 @@ public interface MilvusClient {
    */
   Response loadCollection(String collectionName);
 
+  /**
+   * Pre-loads collection/partitions to memory
+   *
+   * @param collectionName collection to load
+   * @param partitionTags partitions to load
+   * @return <code>Response</code>
+   * @see Response
+   */
+  Response loadCollection(String collectionName, List<String> partitionTags);
+
   /**
    * Gets collection index information
    *

src/main/java/io/milvus/client/MilvusGrpcClient.java

@@ -905,13 +905,22 @@ abstract class AbstractMilvusGrpcClient implements MilvusClient {
 
   @Override
   public Response loadCollection(@Nonnull String collectionName) {
+    return loadCollection(collectionName, new ArrayList<>());
+  }
+
+  @Override
+  public Response loadCollection(@Nonnull String collectionName, List<String> partitionTags) {
 
     if (!maybeAvailable()) {
       logWarning("You are not connected to Milvus server");
       return new Response(Response.Status.CLIENT_NOT_CONNECTED);
     }
 
-    CollectionName request = CollectionName.newBuilder().setCollectionName(collectionName).build();
+    PreloadCollectionParam request =
+        PreloadCollectionParam.newBuilder()
+            .setCollectionName(collectionName)
+            .addAllPartitionTagArray(partitionTags)
+            .build();
     Status response;
 
     try {

src/main/proto/milvus.proto

@@ -117,6 +117,22 @@ message SearchByIDParam {
     repeated KeyValuePair extra_params = 5;
 }
 
+/**
+ * @brief Params for preload collection/partitions
+ */
+message PreloadCollectionParam {
+    string collection_name = 1;
+    repeated string partition_tag_array = 2;
+}
+
+/**
+ * @brief Params for reloading segments
+ */
+message ReLoadSegmentsParam {
+    string collection_name = 1;
+    repeated string segment_id_array = 2;
+}
+
 /**
  * @brief Query result params
  */
@@ -416,13 +432,22 @@ service MilvusService {
     rpc DeleteByID(DeleteByIDParam) returns (Status) {}
 
     /**
-     * @brief This method is used to preload collection
+     * @brief This method is used to preload collection/partitions
      *
-     * @param CollectionName, target collection name.
+     * @param PreloadCollectionParam, target collection/partitions.
+     *
+     * @return Status
+     */
+    rpc PreloadCollection(PreloadCollectionParam) returns (Status) {}
+
+    /**
+     * @brief This method is used to reload collection segments
+     *
+     * @param ReLoadSegmentsParam, target segments information.
      *
      * @return Status
      */
-    rpc PreloadCollection(CollectionName) returns (Status) {}
+    rpc ReloadSegments(ReLoadSegmentsParam) returns (Status) {}
 
     /**
      * @brief This method is used to flush buffer into storage.

src/test/java/io/milvus/client/MilvusGrpcClientTest.java

@@ -45,7 +45,7 @@ import static org.junit.jupiter.api.Assertions.*;
 class ContainerMilvusClientTest extends MilvusClientTest {
   @Container
   private static GenericContainer milvusContainer =
-      new GenericContainer("milvusdb/milvus:0.10.1-cpu-d072020-bd02b1")
+      new GenericContainer("milvusdb/milvus:0.10.5-cpu-d010621-4eda95")
           .withExposedPorts(19530);
 
   @Container