Browse Source

Override toString() for InsertParam/SearchParam (#1064)

Signed-off-by: yhmo <yihua.mo@zilliz.com>
groot 9 months ago
parent
commit
108e951cd2

+ 8 - 8
.github/workflows/java_sdk_ci_test.yaml

@@ -39,11 +39,11 @@ jobs:
           echo "run testcases"
           mvn clean test -Dsurefire.suiteXmlFiles=testng.xml
 
-      - name: Upload logs
-        if: ${{ always() }}
-        uses: actions/upload-artifact@v2
-        with:
-          name: logs-java-sdk-ci-test
-          path: |
-            tests/milvustestv2/target/surefire-reports
-            tests/milvustestv2/target/allure-results 
+#      - name: Upload logs
+#        if: ${{ always() }}
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: logs-java-sdk-ci-test
+#          path: |
+#            tests/milvustestv2/target/surefire-reports
+#            tests/milvustestv2/target/allure-results

+ 18 - 1
src/main/java/io/milvus/param/dml/AnnSearchParam.java

@@ -36,7 +36,6 @@ import java.util.SortedMap;
  * Parameters for <code>hybridSearch</code> interface.
  */
 @Getter
-@ToString
 public class AnnSearchParam {
 
     private final String metricType;
@@ -231,4 +230,22 @@ public class AnnSearchParam {
         }
     }
 
+    /**
+     *
+     * Warning: don't use lombok@ToString to annotate this class
+     * because large number of vectors will waste time in toString() method.
+     *
+     */
+    @Override
+    public String toString() {
+        return "AnnSearchParam{" +
+                "metricType=" + metricType +
+                ", vectorFieldName='" + vectorFieldName + '\'' +
+                ", expr='" + expr + '\'' +
+                ", topK=" + topK +
+                ", nq=" + NQ +
+                ", expr='" + expr + '\'' +
+                ", params='" + params + '\'' +
+                '}';
+    }
 }

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

@@ -34,7 +34,6 @@ import java.util.List;
  * Parameters for <code>insert</code> interface.
  */
 @Getter
-@ToString
 public class InsertParam {
     protected final List<Field> fields;
     protected final List<JsonObject> rows;
@@ -276,4 +275,20 @@ public class InsertParam {
             return values;
         }
     }
+
+    /**
+     *
+     * Warning: don't use lombok@ToString to annotate this class
+     * because large number of vectors will waste time in toString() method.
+     *
+     */
+    @Override
+    public String toString() {
+        return "InsertParam{" +
+                "collectionName='" + collectionName + '\'' +
+                ", databaseName='" + databaseName + '\'' +
+                ", partitionName='" + partitionName + '\'' +
+                ", rowCount=" + rowCount +
+                '}';
+    }
 }

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

@@ -39,7 +39,6 @@ import java.util.SortedMap;
  * Parameters for <code>search</code> interface.
  */
 @Getter
-@ToString
 public class SearchParam {
     private final String databaseName;
     private final String collectionName;
@@ -453,4 +452,29 @@ public class SearchParam {
             throw new ParamException(msg);
         }
     }
+
+    /**
+     *
+     * Warning: don't use lombok@ToString to annotate this class
+     * because large number of vectors will waste time in toString() method.
+     *
+     */
+    @Override
+    public String toString() {
+        return "SearchParam{" +
+                "collectionName='" + collectionName + '\'' +
+                ", databaseName='" + databaseName + '\'' +
+                ", partitionNamesCount='" + partitionNames.size() + '\'' +
+                ", metricType=" + metricType +
+                ", vectorFieldName='" + vectorFieldName + '\'' +
+                ", expr='" + expr + '\'' +
+                ", topK=" + topK +
+                ", nq=" + NQ +
+                ", expr='" + expr + '\'' +
+                ", params='" + params + '\'' +
+                ", outputFields=" + outFields +
+                ", consistencyLevel='" + consistencyLevel + '\'' +
+                ", ignoreGrowing='" + ignoreGrowing + '\'' +
+                '}';
+    }
 }

+ 15 - 1
src/main/java/io/milvus/param/dml/UpsertParam.java

@@ -31,7 +31,6 @@ import java.util.List;
 /**
  * Parameters for <code>upsert</code> interface.
  */
-@ToString
 public class UpsertParam extends InsertParam {
     private UpsertParam(@NonNull Builder builder) {
         super(builder);
@@ -137,4 +136,19 @@ public class UpsertParam extends InsertParam {
         }
     }
 
+    /**
+     *
+     * Warning: don't use lombok@ToString to annotate this class
+     * because large number of vectors will waste time in toString() method.
+     *
+     */
+    @Override
+    public String toString() {
+        return "UpsertParam{" +
+                "collectionName='" + collectionName + '\'' +
+                ", databaseName='" + databaseName + '\'' +
+                ", partitionName='" + partitionName + '\'' +
+                ", rowCount=" + rowCount +
+                '}';
+    }
 }

+ 16 - 1
src/main/java/io/milvus/param/highlevel/dml/InsertRowsParam.java

@@ -34,7 +34,6 @@ import java.util.List;
  * Parameters for <code>insert</code> interface.
  */
 @Getter
-@ToString
 public class InsertRowsParam {
 
     private final InsertParam insertParam;
@@ -120,4 +119,20 @@ public class InsertRowsParam {
             return new InsertRowsParam(insertParam);
         }
     }
+
+    /**
+     *
+     * Warning: don't use lombok@ToString to annotate this class
+     * because large number of vectors will waste time in toString() method.
+     *
+     */
+    @Override
+    public String toString() {
+        return "InsertRowsParam{" +
+                "collectionName='" + insertParam.getCollectionName() + '\'' +
+                ", databaseName='" + insertParam.getDatabaseName() + '\'' +
+                ", partitionName='" + insertParam.getPartitionName() + '\'' +
+                ", rowCount=" + insertParam.getRowCount() +
+                '}';
+    }
 }

+ 20 - 1
src/main/java/io/milvus/param/highlevel/dml/SearchSimpleParam.java

@@ -39,7 +39,6 @@ import java.util.Map;
  * Parameters for <code>search</code> interface.
  */
 @Getter
-@ToString
 public class SearchSimpleParam {
     private final String collectionName;
     private final List<?> vectors;
@@ -187,4 +186,24 @@ public class SearchSimpleParam {
             return new SearchSimpleParam(this);
         }
     }
+
+    /**
+     *
+     * Warning: don't use lombok@ToString to annotate this class
+     * because large number of vectors will waste time in toString() method.
+     *
+     */
+    @Override
+    public String toString() {
+        return "SearchSimpleParam{" +
+                "collectionName='" + collectionName + '\'' +
+                ", params='" + params + '\'' +
+                ", filter='" + filter + '\'' +
+                ", NQ=" + vectors.size() +
+                ", limit=" + limit +
+                ", offset=" + offset +
+                ", outputFields=" + outputFields +
+                ", consistencyLevel='" + consistencyLevel + '\'' +
+                '}';
+    }
 }