Browse Source

Simplify `dropCollection`

jianghua 4 năm trước cách đây
mục cha
commit
4b33002685

+ 1 - 3
src/main/java/io/milvus/client/MilvusClient.java

@@ -103,10 +103,8 @@ public interface MilvusClient {
    * Drops collection
    *
    * @param collectionName collection to drop
-   * @return <code>Response</code>
-   * @see Response
    */
-  Response dropCollection(String collectionName);
+  void dropCollection(String collectionName);
 
   /**
    * Creates index specified by <code>index</code>

+ 6 - 25
src/main/java/io/milvus/client/MilvusGrpcClient.java

@@ -259,31 +259,12 @@ abstract class AbstractMilvusGrpcClient implements MilvusClient {
   }
 
   @Override
-  public Response dropCollection(@Nonnull String collectionName) {
-
-    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();
-    Status response;
-
-    try {
-      response = blockingStub().dropCollection(request);
-
-      if (response.getErrorCode() == ErrorCode.SUCCESS) {
-        logInfo("Dropped collection `{}` successfully!", collectionName);
-        return new Response(Response.Status.SUCCESS);
-      } else {
-        logError("Drop collection `{}` failed:\n{}", collectionName, response.toString());
-        return new Response(
-            Response.Status.valueOf(response.getErrorCodeValue()), response.getReason());
-      }
-    } catch (StatusRuntimeException e) {
-      logError("dropCollection RPC failed:\n{}", e.getStatus().toString());
-      return new Response(Response.Status.RPC_ERROR, e.toString());
-    }
+  public void dropCollection(@Nonnull String collectionName) {
+    translateExceptions(() -> {
+      CollectionName request = CollectionName.newBuilder().setCollectionName(collectionName).build();
+      Status response = blockingStub().dropCollection(request);
+      checkResponseStatus(response);
+    });
   }
 
   @Override

+ 3 - 5
src/test/java/io/milvus/client/MilvusGrpcClientTest.java

@@ -344,9 +344,7 @@ class MilvusClientTest {
   @org.junit.jupiter.api.Test
   void dropCollection() {
     String nonExistingCollectionName = generator.generate(10);
-    Response dropCollectionResponse = client.dropCollection(nonExistingCollectionName);
-    assertFalse(dropCollectionResponse.ok());
-    assertEquals(Response.Status.COLLECTION_NOT_EXISTS, dropCollectionResponse.getStatus());
+    assertErrorCode(ErrorCode.COLLECTION_NOT_EXISTS, () -> client.dropCollection(nonExistingCollectionName));
   }
 
   @org.junit.jupiter.api.Test
@@ -617,7 +615,7 @@ class MilvusClientTest {
     Response dropIndexResponse = client.dropIndex(binaryCollectionName, "binary_vec");
     assertTrue(dropIndexResponse.ok());
 
-    assertTrue(client.dropCollection(binaryCollectionName).ok());
+    client.dropCollection(binaryCollectionName);
   }
 
   @org.junit.jupiter.api.Test
@@ -807,7 +805,7 @@ class MilvusClientTest {
       assertEquals(entityIds.get(i), resultIdsList.get(i).get(0));
     }
 
-    assertTrue(client.dropCollection(binaryCollectionName).ok());
+    client.dropCollection(binaryCollectionName);
   }
 
   @org.junit.jupiter.api.Test