Modify testcases for java-sdk v2

Signed-off-by: yongpengli-z <yongpeng.li@zilliz.com>

tests/milvustestv2/src/main/java/com/zilliz/milvustestv2/common/CommonFunction.java

@@ -109,13 +109,13 @@ public class CommonFunction {
         fieldSchemaList.add(fieldFloatVector);
         CreateCollectionReq.CollectionSchema collectionSchema= CreateCollectionReq.CollectionSchema.builder()
                 .fieldSchemaList(fieldSchemaList)
-                .description("Auto test collection")
-                .enableDynamicField(false)
                 .build();
         CreateCollectionReq createCollectionReq = CreateCollectionReq.builder()
                 .collectionSchema(collectionSchema)
                 .collectionName(collectionName)
                 .enableDynamicField(false)
+                .description("collection desc")
+                .numShards(1)
                 .build();
         BaseTest.milvusClientV2.createCollection(createCollectionReq);
         log.info("create collection:" + collectionName);
@@ -274,7 +274,7 @@ public class CommonFunction {
                 .collectionName(collectionName)
                 .outputFields(Lists.newArrayList("*"))
                 .consistencyLevel(ConsistencyLevel.STRONG)
-                .vectorFieldName(CommonData.fieldFloatVector)
+                .annsField(CommonData.fieldFloatVector)
                 .data(GenerateUtil.generateFloatVector(10, 3, CommonData.dim))
                 .topK(CommonData.topK)
                 .build());

tests/milvustestv2/src/test/java/com/zilliz/milvustestv2/collection/CreateCollectionTest.java

@@ -2,16 +2,20 @@ package com.zilliz.milvustestv2.collection;
 
 import com.zilliz.milvustestv2.common.BaseTest;
 import com.zilliz.milvustestv2.common.CommonData;
-import io.milvus.v2.client.ConnectConfig;
-import io.milvus.v2.client.MilvusClientV2;
+import com.zilliz.milvustestv2.common.CommonFunction;
+import io.milvus.v2.common.DataType;
+import io.milvus.v2.common.IndexParam;
 import io.milvus.v2.service.collection.request.*;
-import io.milvus.v2.service.collection.response.DescribeCollectionResp;
-import io.milvus.v2.service.collection.response.GetCollectionStatsResp;
 import io.milvus.v2.service.collection.response.ListCollectionsResp;
+import io.milvus.v2.service.vector.response.SearchResp;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * @Author yongpeng.li
  * @Date 2024/1/31 15:24
@@ -20,11 +24,12 @@ import org.testng.annotations.Test;
 public class CreateCollectionTest extends BaseTest {
     String simpleCollection="simpleCollection";
     String repeatCollection="repeatCollection";
-
+    String collectionNameWithIndex="collectionNameWithIndex";
     @AfterClass(alwaysRun = true)
     public void cleanTestData(){
         milvusClientV2.dropCollection(DropCollectionReq.builder().collectionName(simpleCollection).build());
         milvusClientV2.dropCollection(DropCollectionReq.builder().collectionName(repeatCollection).build());
+        milvusClientV2.dropCollection(DropCollectionReq.builder().collectionName(collectionNameWithIndex).build());
 
     }
 
@@ -57,4 +62,106 @@ public class CreateCollectionTest extends BaseTest {
         }
     }
 
+    @Test(description = "Create collection with index params,will auto load", groups = {"Smoke"})
+    public void createCollectionWithIndexParams(){
+        CreateCollectionReq.FieldSchema fieldInt64=CreateCollectionReq.FieldSchema.builder()
+                .autoID(false)
+                .dataType(io.milvus.v2.common.DataType.Int64)
+                .isPrimaryKey(true)
+                .name(CommonData.fieldInt64)
+                .build();
+        CreateCollectionReq.FieldSchema fieldInt32=CreateCollectionReq.FieldSchema.builder()
+                .dataType(DataType.Int32)
+                .name(CommonData.fieldInt32)
+                .isPrimaryKey(false)
+                .build();
+        CreateCollectionReq.FieldSchema fieldInt16=CreateCollectionReq.FieldSchema.builder()
+                .dataType(DataType.Int16)
+                .name(CommonData.fieldInt16)
+                .isPrimaryKey(false)
+                .build();
+        CreateCollectionReq.FieldSchema fieldInt8=CreateCollectionReq.FieldSchema.builder()
+                .dataType(DataType.Int8)
+                .name(CommonData.fieldInt8)
+                .isPrimaryKey(false)
+                .build();
+        CreateCollectionReq.FieldSchema fieldDouble=CreateCollectionReq.FieldSchema.builder()
+                .dataType(DataType.Double)
+                .name(CommonData.fieldDouble)
+                .isPrimaryKey(false)
+                .build();
+        CreateCollectionReq.FieldSchema fieldArray=CreateCollectionReq.FieldSchema.builder()
+                .dataType(DataType.Array)
+                .name(CommonData.fieldArray)
+                .elementType(DataType.Int64)
+                .maxCapacity(1000)
+                .isPrimaryKey(false)
+                .build();
+        CreateCollectionReq.FieldSchema fieldBool=CreateCollectionReq.FieldSchema.builder()
+                .dataType(DataType.Bool)
+                .name(CommonData.fieldBool)
+                .isPrimaryKey(false)
+                .build();
+        CreateCollectionReq.FieldSchema fieldVarchar=CreateCollectionReq.FieldSchema.builder()
+                .dataType(DataType.VarChar)
+                .name(CommonData.fieldVarchar)
+                .isPrimaryKey(false)
+                .maxLength(1000)
+                .build();
+        CreateCollectionReq.FieldSchema fieldFloat=CreateCollectionReq.FieldSchema.builder()
+                .dataType(DataType.Float)
+                .name(CommonData.fieldFloat)
+                .isPrimaryKey(false)
+                .build();
+        CreateCollectionReq.FieldSchema fieldJson=CreateCollectionReq.FieldSchema.builder()
+                .dataType(DataType.JSON)
+                .name(CommonData.fieldJson)
+                .isPrimaryKey(false)
+                .build();
+        CreateCollectionReq.FieldSchema fieldFloatVector=CreateCollectionReq.FieldSchema.builder()
+                .dataType(DataType.FloatVector)
+                .name(CommonData.fieldFloatVector)
+                .isPrimaryKey(false)
+                .dimension(CommonData.dim)
+                .build();
+
+        List<CreateCollectionReq.FieldSchema> fieldSchemaList=new ArrayList<>();
+        fieldSchemaList.add(fieldInt64);
+        fieldSchemaList.add(fieldInt32);
+        fieldSchemaList.add(fieldInt16);
+        fieldSchemaList.add(fieldInt8);
+        fieldSchemaList.add(fieldFloat);
+        fieldSchemaList.add(fieldDouble);
+        fieldSchemaList.add(fieldArray);
+        fieldSchemaList.add(fieldBool);
+        fieldSchemaList.add(fieldJson);
+        fieldSchemaList.add(fieldVarchar);
+        fieldSchemaList.add(fieldFloatVector);
+        CreateCollectionReq.CollectionSchema collectionSchema= CreateCollectionReq.CollectionSchema.builder()
+                .fieldSchemaList(fieldSchemaList)
+                .build();
+        IndexParam indexParam = IndexParam.builder()
+                .fieldName(CommonData.fieldFloatVector)
+                .indexType(IndexParam.IndexType.AUTOINDEX)
+                .extraParams(CommonFunction.provideExtraParam(IndexParam.IndexType.AUTOINDEX))
+                .metricType(IndexParam.MetricType.L2)
+                .build();
+        CreateCollectionReq createCollectionReq = CreateCollectionReq.builder()
+                .collectionSchema(collectionSchema)
+                .collectionName(collectionNameWithIndex)
+                .enableDynamicField(false)
+                .indexParams(Collections.singletonList(indexParam))
+                .numShards(1)
+                .build();
+        BaseTest.milvusClientV2.createCollection(createCollectionReq);
+
+        ListCollectionsResp listCollectionsResp = milvusClientV2.listCollections();
+        Assert.assertTrue(listCollectionsResp.getCollectionNames().contains(collectionNameWithIndex));
+        //insert
+        CommonFunction.generateDefaultData(100,CommonData.dim);
+        // search
+        SearchResp searchResp = CommonFunction.defaultSearch(collectionNameWithIndex);
+        Assert.assertEquals(searchResp.getSearchResults().size(),10);
+    }
+
 }

tests/milvustestv2/src/test/java/com/zilliz/milvustestv2/collection/GetCollectionStatsTest.java

@@ -8,6 +8,7 @@ import io.milvus.v2.service.collection.request.DropCollectionReq;
 import io.milvus.v2.service.collection.request.GetCollectionStatsReq;
 import io.milvus.v2.service.collection.response.GetCollectionStatsResp;
 import io.milvus.v2.service.vector.request.InsertReq;
+import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -39,6 +40,6 @@ public class GetCollectionStatsTest extends BaseTest {
                 .collectionName(newCollectionName)
                 .build());
         // getCollectionStats is not accurate, so comment the assert
-        //Assert.assertEquals(collectionStats.getNumOfEntities().longValue(),CommonData.numberEntities);
+        Assert.assertEquals(collectionStats.getNumOfEntities().longValue(),CommonData.numberEntities);
     }
 }

tests/milvustestv2/src/test/java/com/zilliz/milvustestv2/index/ListIndexesTest.java

@@ -1,11 +1,56 @@
 package com.zilliz.milvustestv2.index;
 
+import com.alibaba.fastjson.JSONObject;
 import com.zilliz.milvustestv2.common.BaseTest;
+import com.zilliz.milvustestv2.common.CommonData;
+import com.zilliz.milvustestv2.common.CommonFunction;
+import io.milvus.v2.common.IndexParam;
+import io.milvus.v2.service.collection.request.DropCollectionReq;
+import io.milvus.v2.service.index.request.CreateIndexReq;
+import io.milvus.v2.service.index.request.DropIndexReq;
+import io.milvus.v2.service.index.request.ListIndexesReq;
+import io.milvus.v2.service.vector.request.InsertReq;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.util.Collections;
+import java.util.List;
 
 /**
  * @Author yongpeng.li
  * @Date 2024/2/20 16:35
  */
 public class ListIndexesTest extends BaseTest {
+    String newCollectionName;
+    @BeforeClass(alwaysRun = true)
+    public void providerCollection(){
+        newCollectionName = CommonFunction.createNewCollection(CommonData.dim, null);
+        List<JSONObject> jsonObjects = CommonFunction.generateDefaultData(CommonData.numberEntities, CommonData.dim);
+        milvusClientV2.insert(InsertReq.builder().collectionName(newCollectionName).data(jsonObjects).build());
+        IndexParam indexParam = IndexParam.builder()
+                .fieldName(CommonData.fieldFloatVector)
+                .indexType(IndexParam.IndexType.HNSW)
+                .extraParams(CommonFunction.provideExtraParam(IndexParam.IndexType.HNSW))
+                .metricType(IndexParam.MetricType.L2)
+                .build();
+        milvusClientV2.createIndex(CreateIndexReq.builder()
+                .collectionName(newCollectionName)
+                .indexParams(Collections.singletonList(indexParam))
+                .build());
+    }
+
+    @AfterClass(alwaysRun = true)
+    public void cleanTestData(){
+        milvusClientV2.dropCollection(DropCollectionReq.builder().collectionName(newCollectionName).build());
+    }
+
+    @Test(description = "List index",groups = {"Smoke"})
+    public void listIndex(){
+        List<String> strings = milvusClientV2.listIndexes(ListIndexesReq.builder().collectionName(newCollectionName).build());
+        // 默认索引名称和field名称一样
+        Assert.assertEquals(strings.get(0),CommonData.fieldFloatVector);
 
+    }
 }

tests/milvustestv2/src/test/java/com/zilliz/milvustestv2/loadRelease/LoadPartitionsTest.java

@@ -58,7 +58,7 @@ public class LoadPartitionsTest extends BaseTest {
                 .collectionName(newCollection)
                 .outputFields(Lists.newArrayList("*"))
                 .consistencyLevel(ConsistencyLevel.STRONG)
-                .vectorFieldName(CommonData.fieldFloatVector)
+                .annsField(CommonData.fieldFloatVector)
                 .partitionNames(Lists.newArrayList(CommonData.partitionName))
                 .data(GenerateUtil.generateFloatVector(10, 3, CommonData.dim))
                 .topK(CommonData.topK)

tests/milvustestv2/src/test/java/com/zilliz/milvustestv2/loadRelease/ReleasePartitionsTest.java

@@ -61,7 +61,7 @@ public class ReleasePartitionsTest extends BaseTest {
                     .collectionName(newCollection)
                     .outputFields(Lists.newArrayList("*"))
                     .consistencyLevel(ConsistencyLevel.STRONG)
-                    .vectorFieldName(CommonData.fieldFloatVector)
+                    .annsField(CommonData.fieldFloatVector)
                     .partitionNames(Lists.newArrayList(CommonData.partitionName))
                     .data(GenerateUtil.generateFloatVector(10, 3, CommonData.dim))
                     .topK(CommonData.topK)

tests/milvustestv2/src/test/java/com/zilliz/milvustestv2/rbac/GrantPrivilegeTest.java

@@ -51,7 +51,6 @@ public class GrantPrivilegeTest extends BaseTest {
 
     @AfterMethod(alwaysRun = true)
     public void revokeRolePrivilege() {
-        System.out.println("after:" + privilege);
         milvusClientV2.revokePrivilege(RevokePrivilegeReq.builder()
                 .roleName(CommonData.roleName)
                 .privilege(privilege)

tests/milvustestv2/src/test/java/com/zilliz/milvustestv2/vectorOperation/DeleteTest.java

@@ -66,7 +66,7 @@ public class DeleteTest extends BaseTest {
                 .filter("fieldInt64 < 10 ")
                 .build());
         //the deleteCnt in deleteDataByExpression is not accurate, so comment the assert
-        //Assert.assertEquals(delete.getDeleteCnt(),100);
+        Assert.assertEquals(delete.getDeleteCnt(),10);
     }
 
 

tests/milvustestv2/src/test/java/com/zilliz/milvustestv2/vectorOperation/QueryTest.java

@@ -73,25 +73,38 @@ public class QueryTest extends BaseTest {
                 .consistencyLevel(ConsistencyLevel.STRONG)
                 .outputFields(Lists.newArrayList("*"))
                 .ids(Lists.newArrayList(1, 2, 3, 4))
-                .filter(" fieldInt64 in [10] ")
                 .build());
-        for (QueryResp.QueryResult queryResult : query.getQueryResults()) {
-            System.out.println("查询结果fieldInt64：" + queryResult.getFields().get("fieldInt64"));
 
+        Assert.assertEquals(query.getQueryResults().size(), 4);
+    }
+
+    @Test(description = "queryByIdsAndFilter", groups = {"Smoke"})
+    public void queryByIdsAndFilter() {
+        try {
+            milvusClientV2.query(QueryReq.builder()
+                    .collectionName(CommonData.defaultFloatVectorCollection)
+                    .consistencyLevel(ConsistencyLevel.STRONG)
+                    .outputFields(Lists.newArrayList("*"))
+                    .ids(Lists.newArrayList(1, 2, 3, 4))
+                    .filter(" fieldInt64 in [10] ")
+                    .build());
+        } catch (Exception e) {
+            Assert.assertTrue(e.getMessage().contains("filter and ids can't be set at the same time"));
         }
-        Assert.assertEquals(query.getQueryResults().size(), 1);
+
     }
 
+
     @Test(description = "queryByAlias", groups = {"Smoke"})
     public void queryByAlias() {
         QueryResp query = milvusClientV2.query(QueryReq.builder()
                 .collectionName(CommonData.alias)
                 .consistencyLevel(ConsistencyLevel.STRONG)
-                .outputFields(Lists.newArrayList("*"))
+//                .outputFields(Lists.newArrayList("*"))
                 .ids(Lists.newArrayList(1, 2, 3, 4))
-                .filter(" fieldInt64 in [10] ")
                 .build());
-        Assert.assertEquals(query.getQueryResults().size(), 1);
+        System.out.println(query);
+        Assert.assertEquals(query.getQueryResults().size(), 4);
     }
 
     @Test(description = "queryInPartition", groups = {"Smoke"}, dataProvider = "queryPartition")

tests/milvustestv2/src/test/java/com/zilliz/milvustestv2/vectorOperation/SearchTest.java

@@ -12,6 +12,7 @@ import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author yongpeng.li
@@ -23,7 +24,7 @@ public class SearchTest extends BaseTest {
     @DataProvider(name = "filterAndExcept")
     public Object[][] providerData() {
         return new Object[][]{
-                //{CommonData.fieldVarchar + " like \"%0\" ", topK},
+                {CommonData.fieldVarchar + " like \"%0\" ", topK},
                 {CommonData.fieldInt64 + " < 10 ", topK},
                 {CommonData.fieldInt64 + " != 10 ", topK},
                 {CommonData.fieldInt64 + " <= 10 ", topK},
@@ -62,7 +63,7 @@ public class SearchTest extends BaseTest {
                 .filter(filter)
                 .outputFields(Lists.newArrayList("*"))
                 .consistencyLevel(ConsistencyLevel.STRONG)
-                .vectorFieldName(CommonData.fieldFloatVector)
+                .annsField(CommonData.fieldFloatVector)
                 .data(GenerateUtil.generateFloatVector(CommonData.nq, 3, CommonData.dim))
                 .topK(topK)
                 .build());
@@ -71,6 +72,22 @@ public class SearchTest extends BaseTest {
         Assert.assertEquals(search.getSearchResults().get(0).size(), expect);
     }
 
+    @Test(description = "default search output params return id and distance", groups = {"Smoke"})
+    public void searchWithDefaultOutput() {
+        SearchResp search = milvusClientV2.search(SearchReq.builder()
+                .collectionName(CommonData.defaultFloatVectorCollection)
+                .filter(CommonData.fieldInt64 + " < 10 ")
+                .consistencyLevel(ConsistencyLevel.STRONG)
+                .annsField(CommonData.fieldFloatVector)
+                .data(GenerateUtil.generateFloatVector(CommonData.nq, 3, CommonData.dim))
+                .topK(topK)
+                .build());
+        System.out.println(search);
+        Assert.assertEquals(search.getSearchResults().size(), CommonData.nq);
+        Assert.assertEquals(search.getSearchResults().get(0).size(), topK);
+        Assert.assertEquals(search.getSearchResults().get(0).get(0).getEntity().keySet().size(),0);
+    }
+
     @Test(description = "search in partition", groups = {"Smoke"}, dataProvider = "searchPartition")
     public void searchInPartition(List<String> partitionName, String filter, int expect) {
         SearchResp search = milvusClientV2.search(SearchReq.builder()
@@ -78,7 +95,7 @@ public class SearchTest extends BaseTest {
                 .filter(filter)
                 .outputFields(Lists.newArrayList("*"))
                 .consistencyLevel(ConsistencyLevel.STRONG)
-                .vectorFieldName(CommonData.fieldFloatVector)
+                .annsField(CommonData.fieldFloatVector)
                 .partitionNames(partitionName)
                 .data(GenerateUtil.generateFloatVector(CommonData.nq, 3, CommonData.dim))
                 .topK(topK)
@@ -95,7 +112,7 @@ public class SearchTest extends BaseTest {
                 .filter(filter)
                 .outputFields(Lists.newArrayList("*"))
                 .consistencyLevel(ConsistencyLevel.STRONG)
-                .vectorFieldName(CommonData.fieldFloatVector)
+                .annsField(CommonData.fieldFloatVector)
                 .data(GenerateUtil.generateFloatVector(CommonData.nq, 3, CommonData.dim))
                 .topK(topK)
                 .build());