Răsfoiți Sursa

downgrade mockito version to 4.11.0 to make it compatible with Java 8, and remove retry for search (#825)

* downgrade mockito version to 4.11.0 to make it compatible with Java 8

Signed-off-by: Nian Liu <nian.liu@zilliz.com>

* remove retry from search, where we will add another retry logic for milvus client

Signed-off-by: Nian Liu <nian.liu@zilliz.com>

---------

Signed-off-by: Nian Liu <nian.liu@zilliz.com>
Nian Liu 1 an în urmă
părinte
comite
415e8b8b4e

+ 7 - 1
pom.xml

@@ -94,7 +94,7 @@
         <gson.version>2.10.1</gson.version>
         <kotlin.version>1.9.10</kotlin.version>
         <version.fastjson>1.2.83</version.fastjson>
-        <mockito.version>5.8.0</mockito.version>
+        <mockito.version>4.11.0</mockito.version>
         <testcontainers.version>1.19.6</testcontainers.version>
 
         <hadoop.version>2.7.0</hadoop.version>
@@ -187,6 +187,12 @@
             <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <version>${mockito.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty-shaded</artifactId>

+ 2 - 1
src/main/java/io/milvus/v2/exception/ErrorCode.java

@@ -7,7 +7,8 @@ public enum ErrorCode {
     SUCCESS(0),
     COLLECTION_NOT_FOUND(1),
     SERVER_ERROR(2),
-    INVALID_PARAMS(3);
+    INVALID_PARAMS(3),
+    CLIENT_ERROR(4);
 
     private final int code;
 

+ 3 - 10
src/main/java/io/milvus/v2/service/vector/VectorService.java

@@ -14,6 +14,8 @@ import io.milvus.v2.service.vector.response.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.concurrent.TimeUnit;
+
 public class VectorService extends BaseService {
     Logger logger = LoggerFactory.getLogger(VectorService.class);
     public CollectionService collectionService = new CollectionService();
@@ -77,16 +79,7 @@ public class VectorService extends BaseService {
         SearchRequest searchRequest = vectorUtils.ConvertToGrpcSearchRequest(request);
 
         SearchResults response = milvusServiceBlockingStub.search(searchRequest);
-        int retryCount = 3;
-        while (response.getStatus().getCode() == 2200) {
-            if (retryCount == 0) {
-                throw new MilvusClientException(ErrorCode.SERVER_ERROR, "retry search request failed");
-            }
-            //https://github.com/milvus-io/milvus/issues/29656
-            //issue fix, while the status code is 2200, retry the search request
-            response = milvusServiceBlockingStub.search(searchRequest);
-            retryCount--;
-        }
+
         rpcUtils.handleResponse(title, response.getStatus());
 
         return SearchResp.builder()