Browse Source

Simplify `dropPartition`

jianghua 4 years ago
parent
commit
92fd37692e

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

@@ -176,9 +176,8 @@ public interface MilvusClient {
    *
    * @param collectionName collection name
    * @param tag partition tag
-   * @see Response
    */
-  Response dropPartition(String collectionName, String tag);
+  void dropPartition(String collectionName, String tag);
 
   /**
    * Inserts data specified by <code>insertParam</code>

+ 7 - 30
src/main/java/io/milvus/client/MilvusGrpcClient.java

@@ -315,36 +315,13 @@ abstract class AbstractMilvusGrpcClient implements MilvusClient {
   }
 
   @Override
-  public Response dropPartition(String collectionName, String tag) {
-
-    if (!maybeAvailable()) {
-      logWarning("You are not connected to Milvus server");
-      return new Response(Response.Status.CLIENT_NOT_CONNECTED);
-    }
-
-    PartitionParam request =
-        PartitionParam.newBuilder().setCollectionName(collectionName).setTag(tag).build();
-    Status response;
-
-    try {
-      response = blockingStub().dropPartition(request);
-
-      if (response.getErrorCode() == ErrorCode.SUCCESS) {
-        logInfo("Dropped partition `{}` in collection `{}` successfully!", tag, collectionName);
-        return new Response(Response.Status.SUCCESS);
-      } else {
-        logError(
-            "Drop partition `{}` in collection `{}` failed:\n{}",
-            tag,
-            collectionName,
-            response.toString());
-        return new Response(
-            Response.Status.valueOf(response.getErrorCodeValue()), response.getReason());
-      }
-    } catch (StatusRuntimeException e) {
-      logError("dropPartition RPC failed:\n{}", e.getStatus().toString());
-      return new Response(Response.Status.RPC_ERROR, e.toString());
-    }
+  public void dropPartition(String collectionName, String tag) {
+    translateExceptions(() -> {
+      PartitionParam request =
+          PartitionParam.newBuilder().setCollectionName(collectionName).setTag(tag).build();
+      Status response = blockingStub().dropPartition(request);
+      checkResponseStatus(response);
+    });
   }
 
   @Override

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

@@ -446,13 +446,11 @@ class MilvusClientTest {
 
     assertTrue(client.hasPartition(randomCollectionName, tag1));
 
-    Response dropPartitionResponse = client.dropPartition(randomCollectionName, tag1);
-    assertTrue(dropPartitionResponse.ok());
-
+    client.dropPartition(randomCollectionName, tag1);
     assertFalse(client.hasPartition(randomCollectionName, tag1));
 
-    dropPartitionResponse = client.dropPartition(randomCollectionName, tag2);
-    assertTrue(dropPartitionResponse.ok());
+    client.dropPartition(randomCollectionName, tag2);
+    assertFalse(client.hasPartition(randomCollectionName, tag2));
   }
 
   @org.junit.jupiter.api.Test