Browse Source

Add withDatabaseBame for releaseCollection (#788)

Signed-off-by: yhmo <yihua.mo@zilliz.com>
groot 1 year ago
parent
commit
a27c4a0898

+ 7 - 8
src/main/java/io/milvus/client/AbstractMilvusGrpcClient.java

@@ -559,10 +559,7 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
                 builder.setDbName(requestParam.getDatabaseName());
             }
 
-            LoadCollectionRequest loadCollectionRequest = builder
-                    .build();
-
-            Status response = blockingStub().loadCollection(loadCollectionRequest);
+            Status response = blockingStub().loadCollection(builder.build());
             handleResponse(title, response);
 
             // sync load, wait until collection finish loading
@@ -591,11 +588,13 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
         String title = String.format("ReleaseCollectionRequest collectionName:%s", requestParam.getCollectionName());
 
         try {
-            ReleaseCollectionRequest releaseCollectionRequest = ReleaseCollectionRequest.newBuilder()
-                    .setCollectionName(requestParam.getCollectionName())
-                    .build();
+            ReleaseCollectionRequest.Builder builder = ReleaseCollectionRequest.newBuilder()
+                    .setCollectionName(requestParam.getCollectionName());
+            if (StringUtils.isNotEmpty(requestParam.getDatabaseName())) {
+                builder.setDbName(requestParam.getDatabaseName());
+            }
 
-            Status response = blockingStub().releaseCollection(releaseCollectionRequest);
+            Status response = blockingStub().releaseCollection(builder.build());
             handleResponse(title, response);
             return R.success(new RpcStatus(RpcStatus.SUCCESS_MSG));
         } catch (StatusRuntimeException e) {

+ 15 - 0
src/main/java/io/milvus/param/collection/ReleaseCollectionParam.java

@@ -30,9 +30,11 @@ import lombok.NonNull;
  */
 @Getter
 public class ReleaseCollectionParam {
+    private final String databaseName;
     private final String collectionName;
 
     private ReleaseCollectionParam(@NonNull Builder builder) {
+        this.databaseName = builder.databaseName;
         this.collectionName = builder.collectionName;
     }
 
@@ -44,11 +46,23 @@ public class ReleaseCollectionParam {
      * Builder for {@link ReleaseCollectionParam} class.
      */
     public static final class Builder {
+        private String databaseName;
         private String collectionName;
 
         private Builder() {
         }
 
+        /**
+         * Sets the database name. database name can be nil.
+         *
+         * @param databaseName database name
+         * @return <code>Builder</code>
+         */
+        public Builder withDatabaseName(String databaseName) {
+            this.databaseName = databaseName;
+            return this;
+        }
+
         /**
          * Sets the collection name. Collection name cannot be empty or null.
          *
@@ -80,6 +94,7 @@ public class ReleaseCollectionParam {
     @Override
     public String toString() {
         return "ReleaseCollectionParam{" +
+                "databaseName='" + databaseName + '\'' +
                 "collectionName='" + collectionName + '\'' + '}';
     }
 }