Browse Source

change default timeout to 24 hour

zhiru 5 years ago
parent
commit
09d29e3534

+ 3 - 2
pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.milvus</groupId>
     <artifactId>milvus-sdk-java</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>milvus-sdk-java</name>
@@ -23,6 +23,7 @@
 
     <scm>
         <connection>scm:git:https://github.com/milvus-io/milvus-sdk-java.git</connection>
+        <developerConnection>scm:git:https://github.com/milvus-io/milvus-sdk-java.git</developerConnection>
         <url>https://github.com/milvus-io/milvus-sdk-java</url>
     </scm>
 
@@ -87,7 +88,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>RELEASE</version>
+            <version>5.5.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

+ 1 - 1
src/main/java/io/milvus/client/CommandParam.java

@@ -11,7 +11,7 @@ public class CommandParam {
         private final String command;
 
         // Optional parameters - initialized to default values
-        private long timeout = 10;
+        private long timeout = 86400;
 
         public Builder(String command) {
             this.command = command;

+ 1 - 1
src/main/java/io/milvus/client/DeleteByRangeParam.java

@@ -13,7 +13,7 @@ public class DeleteByRangeParam {
         private final String tableName;
 
         // Optional parameters - initialized to default values
-        private long timeout = 10;
+        private long timeout = 86400;
 
         public Builder(DateRange dateRange, String tableName) {
             this.dateRange = dateRange;

+ 1 - 1
src/main/java/io/milvus/client/IndexParam.java

@@ -14,7 +14,7 @@ public class IndexParam {
 
         // Optional parameters - initialized to default values
         private Index index;
-        private long timeout = 10;
+        private long timeout = 86400;
 
         public Builder(String tableName) {
             this.tableName = tableName;

+ 1 - 1
src/main/java/io/milvus/client/InsertParam.java

@@ -17,7 +17,7 @@ public class InsertParam {
 
         // Optional parameters - initialized to default values
         private List<Long> vectorIds = new ArrayList<>();
-        private long timeout = 10;
+        private long timeout = 86400;
 
         public Builder(String tableName, List<List<Float>> vectors) {
             this.tableName = tableName;

+ 4 - 0
src/main/java/io/milvus/client/MilvusClient.java

@@ -7,6 +7,10 @@ public interface MilvusClient {
         return clientVersion;
     }
 
+    /**
+     * @param connectParam
+     * @return <code>Response</code>
+     */
     Response connect(ConnectParam connectParam);
 
     boolean connected();

+ 4 - 13
src/main/java/io/milvus/client/MilvusGrpcClient.java

@@ -16,15 +16,6 @@ public class MilvusGrpcClient implements MilvusClient {
     private ManagedChannel channel = null;
     private io.milvus.client.grpc.MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub;
 
-//    private MilvusGrpcClient(String host, int port) {
-//        this(ManagedChannelBuilder.forAddress(host, port).usePlaintext());
-//    }
-//
-//    private MilvusGrpcClient(ManagedChannelBuilder<?> channelBuilder) {
-//        channel = channelBuilder.build();
-//        blockingStub = io.milvus.client.grpc.MilvusServiceGrpc.newBlockingStub(channel);
-//    }
-
     ///////////////////////Client Calls///////////////////////
 
     @Override
@@ -429,9 +420,7 @@ public class MilvusGrpcClient implements MilvusClient {
         io.milvus.client.grpc.TableNameList response;
 
         try {
-            response = blockingStub
-                       .withDeadlineAfter(10, TimeUnit.SECONDS)
-                       .showTables(request);
+            response = blockingStub.showTables(request);
 
             if (response.getStatus().getErrorCode() == io.milvus.client.grpc.ErrorCode.SUCCESS) {
                 List<String> tableNames = response.getTableNamesList();
@@ -656,7 +645,9 @@ public class MilvusGrpcClient implements MilvusClient {
         io.milvus.client.grpc.Status response;
 
         try {
-            response = blockingStub.dropIndex(request);
+            response = blockingStub
+                       .withDeadlineAfter(tableParam.getTimeout(), TimeUnit.SECONDS)
+                       .dropIndex(request);
 
             if (response.getErrorCode() == io.milvus.client.grpc.ErrorCode.SUCCESS) {
                 logInfo("Dropped index for table `{0}` successfully!", tableName);

+ 1 - 1
src/main/java/io/milvus/client/SearchInFilesParam.java

@@ -14,7 +14,7 @@ public class SearchInFilesParam {
         private final SearchParam searchParam;
 
         // Optional parameters - initialized to default values
-        private long timeout = 10;
+        private long timeout = 86400;
 
         public Builder(List<String> fileIds, SearchParam searchParam) {
             this.fileIds = fileIds;

+ 1 - 1
src/main/java/io/milvus/client/SearchParam.java

@@ -22,7 +22,7 @@ public class SearchParam {
         private List<DateRange> queryRanges = new ArrayList<>();
         private long topK = 1;
         private long nProbe = 10;
-        private long timeout = 10;
+        private long timeout = 86400;
 
         public Builder(String tableName, List<List<Float>> queryVectors) {
             this.tableName = tableName;

+ 1 - 1
src/main/java/io/milvus/client/TableParam.java

@@ -11,7 +11,7 @@ public class TableParam {
         private final String tableName;
 
         // Optional parameters - initialized to default values
-        private long timeout = 10;
+        private long timeout = 86400;
 
         public Builder(String tableName) {
             this.tableName = tableName;

+ 1 - 1
src/main/java/io/milvus/client/TableSchemaParam.java

@@ -11,7 +11,7 @@ public class TableSchemaParam {
         private final TableSchema tableSchema;
 
         // Optional parameters - initialized to default values
-        private long timeout = 10;
+        private long timeout = 86400;
 
         public Builder(TableSchema tableSchema) {
             this.tableSchema = tableSchema;