Skip to content

Commit 23c3a09

Browse files
yongpengli-zyongpengli-z
authored
Add testcases about add field (milvus-io#1494)
Signed-off-by: yongpengli-z <yongpeng.li@zilliz.com>
1 parent 2c20f89 commit 23c3a09

4 files changed

Lines changed: 318 additions & 53 deletions

File tree

‎tests/milvustestv2/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<dependency>
7171
<groupId>io.milvus</groupId>
7272
<artifactId>milvus-sdk-java</artifactId>
73-
<version>2.5.5</version>
73+
<version>2.6.0</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>com.google.protobuf</groupId>

‎tests/milvustestv2/src/main/java/com/zilliz/milvustestv2/common/CommonData.java‎

Lines changed: 90 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,65 @@
11
package com.zilliz.milvustestv2.common;
22

3+
import io.milvus.v2.common.DataType;
4+
35
/**
46
* @Author yongpeng.li
57
* @Date 2024/1/31 18:03
68
*/
79
public class CommonData {
8-
public static long numberEntities=5000;
9-
public static long batchSize=1000;
10-
public static int dim=128;
11-
public static String defaultFloatVectorCollection="FloatVectorCollection";
12-
public static String defaultBinaryVectorCollection="BinaryVectorCollection";
13-
public static String defaultFloat16VectorCollection="Float16VectorCollection";
14-
public static String defaultBFloat16VectorCollection="BFloat16VectorCollection";
15-
public static String defaultSparseFloatVectorCollection="SparseFloatVectorCollection";
16-
public static String partitionNameA="partitionNameA";
17-
public static String partitionNameB="partitionNameB";
18-
public static String partitionNameC="partitionNameC";
19-
public static String defaultPartitionName="_default";
20-
public static String fieldInt64="fieldInt64";
21-
public static String fieldInt32="fieldInt32";
22-
public static String fieldInt16="fieldInt16";
23-
public static String fieldInt8="fieldInt8";
24-
public static String fieldDouble="fieldDouble";
25-
public static String fieldArray="fieldArray";
26-
public static String fieldBool="fieldBool";
27-
public static String fieldVarchar="fieldVarchar";
28-
public static String fieldFloat="fieldFloat";
29-
public static String fieldJson="fieldJson";
30-
31-
public static String fieldDynamic="fieldDynamic";
32-
public static String fieldDynamicNotExist="fieldDynamicNotExist";
33-
public static String fieldFloatVector="fieldFloatVector";
34-
public static String fieldBinaryVector="fieldBinaryVector";
35-
public static String fieldFloat16Vector="fieldFloat16Vector";
36-
public static String fieldBF16Vector="fieldBF16Vector";
37-
public static String fieldSparseVector="fieldSparseVector";
38-
39-
40-
public static String partitionName="partitionName";
10+
public static long numberEntities = 5000;
11+
public static long batchSize = 1000;
12+
public static int dim = 128;
13+
public static int maxCapacity = 100;
14+
public static String defaultFloatVectorCollection = "FloatVectorCollection";
15+
public static String defaultBinaryVectorCollection = "BinaryVectorCollection";
16+
public static String defaultFloat16VectorCollection = "Float16VectorCollection";
17+
public static String defaultBFloat16VectorCollection = "BFloat16VectorCollection";
18+
public static String defaultSparseFloatVectorCollection = "SparseFloatVectorCollection";
19+
public static String partitionNameA = "partitionNameA";
20+
public static String partitionNameB = "partitionNameB";
21+
public static String partitionNameC = "partitionNameC";
22+
public static String defaultPartitionName = "_default";
23+
public static String fieldInt64 = "fieldInt64";
24+
public static String fieldInt32 = "fieldInt32";
25+
public static String fieldInt16 = "fieldInt16";
26+
public static String fieldInt8 = "fieldInt8";
27+
public static String fieldDouble = "fieldDouble";
28+
public static String fieldArray = "fieldArray";
29+
public static String fieldBool = "fieldBool";
30+
public static String fieldVarchar = "fieldVarchar";
31+
public static String fieldFloat = "fieldFloat";
32+
public static String fieldJson = "fieldJson";
33+
public static String dynamicField="dynamicField";
34+
public static String fieldDynamic = "fieldDynamic";
35+
public static String fieldDynamicNotExist = "fieldDynamicNotExist";
36+
public static String fieldFloatVector = "fieldFloatVector";
37+
public static String fieldBinaryVector = "fieldBinaryVector";
38+
public static String fieldFloat16Vector = "fieldFloat16Vector";
39+
public static String fieldBF16Vector = "fieldBF16Vector";
40+
public static String fieldSparseVector = "fieldSparseVector";
41+
public static int addMaxLength = 99;
42+
43+
44+
public static String partitionName = "partitionName";
4145
// 快速创建时候的默认向量filed
42-
public static String simpleVector="vector";
43-
public static String simplePk="id";
44-
public static String alias="ColAlias";
46+
public static String simpleVector = "vector";
47+
public static String simplePk = "id";
48+
public static String alias = "ColAlias";
4549

46-
public static int topK=10;
47-
public static int nq=1;
50+
public static int topK = 10;
51+
public static int nq = 1;
4852

49-
public static String rootUser="root";
53+
public static String rootUser = "root";
5054

51-
public static String userName="user1";
52-
public static String password="password1";
55+
public static String userName = "user1";
56+
public static String password = "password1";
5357

54-
public static String roleName="role02";
58+
public static String roleName = "role02";
5559

56-
public static String databaseName="database00";
57-
public static String databaseName2="database02";
58-
public static String databaseName1="database01";
60+
public static String databaseName = "database00";
61+
public static String databaseName2 = "database02";
62+
public static String databaseName1 = "database01";
5963

6064
public static short defaultValueShort = 1;
6165
public static int defaultValueInt = 1;
@@ -65,12 +69,47 @@ public class CommonData {
6569
public static String defaultValueString = "1.0";
6670

6771
public static int groupSize = 3;
68-
public static String resourceGroup="resourceGroup01";
69-
public static String defaultResourceGroup="__default_resource_group";
70-
public static String resourceGroup2="resourceGroup02";
71-
72-
73-
72+
public static String resourceGroup = "resourceGroup01";
73+
public static String defaultResourceGroup = "__default_resource_group";
74+
public static String resourceGroup2 = "resourceGroup02";
75+
76+
77+
public static String providerFieldNameByDatatype(DataType dataType) {
78+
switch (dataType) {
79+
case VarChar:
80+
return fieldVarchar;
81+
case Int64:
82+
return fieldInt64;
83+
case Int8:
84+
return fieldInt8;
85+
case Int16:
86+
return fieldInt16;
87+
case Int32:
88+
return fieldInt32;
89+
case Float:
90+
return fieldFloat;
91+
case Double:
92+
return fieldDouble;
93+
case FloatVector:
94+
return fieldFloatVector;
95+
case BinaryVector:
96+
return fieldBinaryVector;
97+
case Float16Vector:
98+
return fieldFloat16Vector;
99+
case BFloat16Vector:
100+
return fieldBF16Vector;
101+
case SparseFloatVector:
102+
return fieldSparseVector;
103+
case Bool:
104+
return fieldBool;
105+
case Array:
106+
return fieldArray;
107+
case JSON:
108+
return fieldJson;
109+
default:
110+
return fieldDynamic;
111+
}
112+
}
74113

75114

76115
}

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1296,7 +1296,10 @@ public static void createIndexAndInsertAndLoad(String collectionName, DataType v
12961296
if (ifLoad) {
12971297
milvusClientV2.loadCollection(LoadCollectionReq.builder().collectionName(collectionName).build());
12981298
}
1299-
insertIntoCollectionByBatch(collectionName, numberEntities, CommonData.dim, vectorType);
1299+
// insertIntoCollectionByBatch(collectionName, numberEntities, CommonData.dim, vectorType);
1300+
List<JsonObject> jsonObjects = genCommonData(collectionName, numberEntities);
1301+
InsertResp insert = milvusClientV2.insert(InsertReq.builder().collectionName(collectionName).data(jsonObjects).build());
1302+
13001303

13011304
}
13021305

@@ -1480,6 +1483,11 @@ public static List<JsonObject> genCommonData(String collectionName, long count)
14801483
}
14811484
row = JsonObjectUtil.jsonMerge(row, jsonObject);
14821485
}
1486+
// 判断是否有动态列
1487+
if (describeCollectionResp.getCollectionSchema().isEnableDynamicField()) {
1488+
JsonObject jsonObject = generalJsonObjectByDataType(CommonData.dynamicField, DataType.JSON, 0, i);
1489+
row = JsonObjectUtil.jsonMerge(row, jsonObject);
1490+
}
14831491
jsonList.add(row);
14841492
}
14851493
return jsonList;

0 commit comments

Comments
 (0)