Browse Source

Fix typo (#227)

Signed-off-by: yhmo <yihua.mo@zilliz.com>
groot 3 years ago
parent
commit
660e47a75f

+ 0 - 1
src/main/java/io/milvus/Response/FieldDataWrapper.java

@@ -4,7 +4,6 @@ import io.milvus.grpc.DataType;
 import io.milvus.grpc.FieldData;
 import io.milvus.grpc.FieldData;
 import io.milvus.exception.IllegalResponseException;
 import io.milvus.exception.IllegalResponseException;
 
 
-import io.milvus.param.Constant;
 import lombok.NonNull;
 import lombok.NonNull;
 
 
 import java.nio.ByteBuffer;
 import java.nio.ByteBuffer;

+ 0 - 1
src/main/java/io/milvus/Response/GetCollStatResponseWrapper.java

@@ -1,6 +1,5 @@
 package io.milvus.Response;
 package io.milvus.Response;
 
 
-import io.milvus.exception.IllegalResponseException;
 import io.milvus.grpc.GetCollectionStatisticsResponse;
 import io.milvus.grpc.GetCollectionStatisticsResponse;
 import io.milvus.grpc.KeyValuePair;
 import io.milvus.grpc.KeyValuePair;
 import lombok.NonNull;
 import lombok.NonNull;

+ 0 - 4
src/main/java/io/milvus/Response/QueryResultsWrapper.java

@@ -1,14 +1,10 @@
 package io.milvus.Response;
 package io.milvus.Response;
 
 
-import io.milvus.exception.IllegalResponseException;
 import io.milvus.exception.ParamException;
 import io.milvus.exception.ParamException;
 import io.milvus.grpc.*;
 import io.milvus.grpc.*;
-import io.milvus.param.dml.InsertParam;
 
 
-import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
 
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**

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

@@ -112,6 +112,7 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
                     }
                     }
                 }
                 }
 
 
+                assert totalBuf != null;
                 ByteString byteString = ByteString.copyFrom(totalBuf.array());
                 ByteString byteString = ByteString.copyFrom(totalBuf.array());
                 VectorField vectorField = VectorField.newBuilder().setDim(dim).setBinaryVector(byteString).build();
                 VectorField vectorField = VectorField.newBuilder().setDim(dim).setBinaryVector(byteString).build();
                 return builder.setFieldName(fieldName).setType(DataType.BinaryVector).setVectors(vectorField).build();
                 return builder.setFieldName(fieldName).setType(DataType.BinaryVector).setVectors(vectorField).build();
@@ -129,7 +130,7 @@ public abstract class AbstractMilvusGrpcClient implements MilvusClient {
                 case Int32:
                 case Int32:
                 case Int16:
                 case Int16:
                 case Int8:
                 case Int8:
-                    List<Integer> integers = objects.stream().map(p -> (Integer) p).collect(Collectors.toList());
+                    List<Integer> integers = objects.stream().map(p -> p instanceof Short ? ((Short)p).intValue() :(Integer) p).collect(Collectors.toList());
                     IntArray intArray = IntArray.newBuilder().addAllData(integers).build();
                     IntArray intArray = IntArray.newBuilder().addAllData(integers).build();
                     ScalarField scalarField2 = ScalarField.newBuilder().setIntData(intArray).build();
                     ScalarField scalarField2 = ScalarField.newBuilder().setIntData(intArray).build();
                     return builder.setFieldName(fieldName).setType(dataType).setScalars(scalarField2).build();
                     return builder.setFieldName(fieldName).setType(dataType).setScalars(scalarField2).build();

+ 1 - 1
src/main/java/io/milvus/param/ConnectParam.java

@@ -85,7 +85,7 @@ public class ConnectParam {
         private String host = "localhost";
         private String host = "localhost";
         private int port = 19530;
         private int port = 19530;
         private long connectTimeoutMs = 10000;
         private long connectTimeoutMs = 10000;
-        private long keepAliveTimeMs = Long.MAX_VALUE; // Disabling keepalive
+        private long keepAliveTimeMs = Long.MAX_VALUE; // Disabling keep alive
         private long keepAliveTimeoutMs = 20000;
         private long keepAliveTimeoutMs = 20000;
         private boolean keepAliveWithoutCalls = false;
         private boolean keepAliveWithoutCalls = false;
         private long idleTimeoutMs = TimeUnit.MILLISECONDS.convert(24, TimeUnit.HOURS);
         private long idleTimeoutMs = TimeUnit.MILLISECONDS.convert(24, TimeUnit.HOURS);

+ 1 - 1
src/main/java/io/milvus/param/collection/FieldType.java

@@ -166,7 +166,7 @@ public class FieldType {
                 }
                 }
 
 
                 try {
                 try {
-                    Integer dim = Integer.valueOf(typeParams.get(Constant.VECTOR_DIM));
+                    int dim = Integer.parseInt(typeParams.get(Constant.VECTOR_DIM));
                     if (dim <= 0) {
                     if (dim <= 0) {
                         throw new ParamException("Vector field dimension must be larger than zero");
                         throw new ParamException("Vector field dimension must be larger than zero");
                     }
                     }

+ 3 - 3
src/main/java/io/milvus/param/collection/FlushParam.java

@@ -23,8 +23,8 @@ public class FlushParam {
     private FlushParam(@NonNull Builder builder) {
     private FlushParam(@NonNull Builder builder) {
         this.collectionNames = builder.collectionNames;
         this.collectionNames = builder.collectionNames;
         this.syncFlush = builder.syncFlush;
         this.syncFlush = builder.syncFlush;
-        this.syncFlushWaitingInterval = builder.syncFlushWaitingInterval.longValue();
-        this.syncFlushWaitingTimeout = builder.syncFlushWaitingTimeout.longValue();
+        this.syncFlushWaitingInterval = builder.syncFlushWaitingInterval;
+        this.syncFlushWaitingTimeout = builder.syncFlushWaitingTimeout;
     }
     }
 
 
     public static Builder newBuilder() {
     public static Builder newBuilder() {
@@ -35,7 +35,7 @@ public class FlushParam {
      * Builder for <code>FlushParam</code> class.
      * Builder for <code>FlushParam</code> class.
      */
      */
     public static final class Builder {
     public static final class Builder {
-        private List<String> collectionNames = new ArrayList<String>();
+        private List<String> collectionNames = new ArrayList<>();
 
 
         // syncFlush:
         // syncFlush:
         //   Default behavior is sync flushing, flush() return after collection finish flushing.
         //   Default behavior is sync flushing, flush() return after collection finish flushing.

+ 1 - 1
src/main/java/io/milvus/param/collection/LoadCollectionParam.java

@@ -87,7 +87,7 @@ public class LoadCollectionParam {
          *
          *
          * If not sync mode, client will return at once after the loadCollection() is called.
          * If not sync mode, client will return at once after the loadCollection() is called.
          *
          *
-         * @param syncLoad <code>Boolean.TRUE</code> is sync mode, Bollean.FALSE is not
+         * @param syncLoad <code>Boolean.TRUE</code> is sync mode, Boolean.FALSE is not
          * @return <code>Builder</code>
          * @return <code>Builder</code>
          */
          */
         public Builder withSyncLoad(@NonNull Boolean syncLoad) {
         public Builder withSyncLoad(@NonNull Boolean syncLoad) {

+ 2 - 2
src/main/java/io/milvus/param/dml/InsertParam.java

@@ -185,8 +185,8 @@ public class InsertParam {
                 } else if (field.getType() == DataType.Int32 || field.getType() == DataType.Int16
                 } else if (field.getType() == DataType.Int32 || field.getType() == DataType.Int16
                         || field.getType() == DataType.Int8 ) {
                         || field.getType() == DataType.Int8 ) {
                     for (Object obj : values) {
                     for (Object obj : values) {
-                        if (!(obj instanceof Integer)) {
-                            throw new ParamException("Int32/Int16/Int8 field value type must be Integer");
+                        if (!(obj instanceof Integer) && !(obj instanceof Short)) {
+                            throw new ParamException("Int32/Int16/Int8 field value type must be Integer or Short");
                         }
                         }
                     }
                     }
                 } else if (field.getType() == DataType.Float) {
                 } else if (field.getType() == DataType.Float) {

+ 3 - 3
src/main/java/io/milvus/param/dml/SearchParam.java

@@ -216,14 +216,14 @@ public class SearchParam {
 
 
             if (vectors.get(0) instanceof List) {
             if (vectors.get(0) instanceof List) {
                 // float vectors
                 // float vectors
-                List first = (List) vectors.get(0);
+                List<?> first = (List<?>) vectors.get(0);
                 if (!(first.get(0) instanceof Float)) {
                 if (!(first.get(0) instanceof Float)) {
                     throw new ParamException("Float vector field's value must be Lst<Float>");
                     throw new ParamException("Float vector field's value must be Lst<Float>");
                 }
                 }
 
 
                 int dim = first.size();
                 int dim = first.size();
                 for (int i = 1; i < vectors.size(); ++i) {
                 for (int i = 1; i < vectors.size(); ++i) {
-                    List temp = (List) vectors.get(i);
+                    List<?> temp = (List<?>) vectors.get(i);
                     if (dim != temp.size()) {
                     if (dim != temp.size()) {
                         throw new ParamException("Target vector dimension must be equal");
                         throw new ParamException("Target vector dimension must be equal");
                     }
                     }
@@ -256,7 +256,7 @@ public class SearchParam {
         return "SearchParam{" +
         return "SearchParam{" +
                 "collectionName='" + collectionName + '\'' +
                 "collectionName='" + collectionName + '\'' +
                 ", partitionNames='" + partitionNames.toString() + '\'' +
                 ", partitionNames='" + partitionNames.toString() + '\'' +
-                ", metricType=" + metricType.toString() +
+                ", metricType=" + metricType +
                 ", target vectors count=" + vectors.size() +
                 ", target vectors count=" + vectors.size() +
                 ", vectorFieldName='" + vectorFieldName + '\'' +
                 ", vectorFieldName='" + vectorFieldName + '\'' +
                 ", topK=" + topK +
                 ", topK=" + topK +

+ 1 - 2
src/main/java/io/milvus/param/index/CreateIndexParam.java

@@ -25,7 +25,6 @@ import io.milvus.param.IndexType;
 import io.milvus.param.MetricType;
 import io.milvus.param.MetricType;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 
 
-import io.milvus.param.collection.LoadCollectionParam;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
 import java.util.HashMap;
 import java.util.HashMap;
@@ -149,7 +148,7 @@ public class CreateIndexParam {
          *
          *
          * If not sync mode, client will return at once after the createIndex() is called.
          * If not sync mode, client will return at once after the createIndex() is called.
          *
          *
-         * @param syncMode <code>Boolean.TRUE</code> is sync mode, Bollean.FALSE is not
+         * @param syncMode <code>Boolean.TRUE</code> is sync mode, Boolean.FALSE is not
          * @return <code>Builder</code>
          * @return <code>Builder</code>
          */
          */
         public Builder withSyncMode(@NonNull Boolean syncMode) {
         public Builder withSyncMode(@NonNull Boolean syncMode) {

+ 1 - 2
src/main/java/io/milvus/param/partition/LoadPartitionsParam.java

@@ -23,7 +23,6 @@ import io.milvus.exception.ParamException;
 import io.milvus.param.Constant;
 import io.milvus.param.Constant;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ParamUtils;
 
 
-import io.milvus.param.collection.LoadCollectionParam;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.NonNull;
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -115,7 +114,7 @@ public class LoadPartitionsParam {
          *
          *
          * If not sync mode, client will return at once after the loadPartitions() is called.
          * If not sync mode, client will return at once after the loadPartitions() is called.
          *
          *
-         * @param syncLoad <code>Boolean.TRUE</code> is sync mode, Bollean.FALSE is not
+         * @param syncLoad <code>Boolean.TRUE</code> is sync mode, Boolean.FALSE is not
          * @return <code>Builder</code>
          * @return <code>Builder</code>
          */
          */
         public Builder withSyncLoad(@NonNull Boolean syncLoad) {
         public Builder withSyncLoad(@NonNull Boolean syncLoad) {

+ 3 - 3
src/test/java/io/milvus/client/MilvusClientDockerTest.java

@@ -203,7 +203,7 @@ public class MilvusClientDockerTest {
                 .build());
                 .build());
 
 
         fieldsSchema.add(FieldType.newBuilder()
         fieldsSchema.add(FieldType.newBuilder()
-                .withDataType(DataType.Int32)
+                .withDataType(DataType.Int8)
                 .withName(field5Name)
                 .withName(field5Name)
                 .withDescription("age")
                 .withDescription("age")
                 .build());
                 .build());
@@ -223,12 +223,12 @@ public class MilvusClientDockerTest {
         List<Long> ids = new ArrayList<>();
         List<Long> ids = new ArrayList<>();
         List<Boolean> genders = new ArrayList<>();
         List<Boolean> genders = new ArrayList<>();
         List<Double> weights = new ArrayList<>();
         List<Double> weights = new ArrayList<>();
-        List<Integer> ages = new ArrayList<>();
+        List<Short> ages = new ArrayList<>();
         for (long i = 0L; i < rowCount; ++i) {
         for (long i = 0L; i < rowCount; ++i) {
             ids.add(i);
             ids.add(i);
             genders.add(i%3 == 0 ? Boolean.TRUE : Boolean.FALSE);
             genders.add(i%3 == 0 ? Boolean.TRUE : Boolean.FALSE);
             weights.add((double) (i / 100));
             weights.add((double) (i / 100));
-            ages.add((int)i%99);
+            ages.add((short)(i%99));
         }
         }
         List<List<Float>> vectors = generateFloatVectors(rowCount);
         List<List<Float>> vectors = generateFloatVectors(rowCount);
 
 

+ 2 - 1
src/test/java/io/milvus/client/MilvusServiceClientTest.java

@@ -534,7 +534,7 @@ class MilvusServiceClientTest {
         );
         );
 
 
         assertThrows(ParamException.class, () -> FlushParam.newBuilder()
         assertThrows(ParamException.class, () -> FlushParam.newBuilder()
-                .addCollectionName("collection1")
+                .withCollectionNames(Collections.singletonList("collection1"))
                 .withSyncFlush(Boolean.TRUE)
                 .withSyncFlush(Boolean.TRUE)
                 .withSyncFlushWaitingInterval(Constant.MAX_WAITING_FLUSHING_INTERVAL + 1)
                 .withSyncFlushWaitingInterval(Constant.MAX_WAITING_FLUSHING_INTERVAL + 1)
                 .build()
                 .build()
@@ -1490,6 +1490,7 @@ class MilvusServiceClientTest {
                 .withTopK(5)
                 .withTopK(5)
                 .withVectors(vectors)
                 .withVectors(vectors)
                 .withExpr("dummy")
                 .withExpr("dummy")
+                .withRoundDecimal(5)
                 .build();
                 .build();
         R<SearchResults> resp = client.search(param);
         R<SearchResults> resp = client.search(param);
         assertEquals(R.Status.Success.getCode(), resp.getStatus());
         assertEquals(R.Status.Success.getCode(), resp.getStatus());