Skip to content

Commit 72ac7ed

Browse files
authored
add testcases for random sampling (#1333)
Signed-off-by: yongpengli-z <yongpeng.li@zilliz.com>
1 parent 093abe3 commit 72ac7ed

10 files changed

Lines changed: 329 additions & 45 deletions

File tree

.github/workflows/java_sdk_ci_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: |
2929
echo "build jar"
3030
git submodule update --init
31-
mvn clean versions:set -DnewVersion=2.4.0
31+
mvn clean versions:set -DnewVersion=2.5.5
3232
mvn clean install -Dmaven.test.skip=true
3333
3434
# - name: Test

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.4.0</version>
73+
<version>2.5.5</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>com.google.protobuf</groupId>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import com.zilliz.milvustestv2.config.ConnectInfoConfig;
66
import com.zilliz.milvustestv2.params.FieldParam;
77
import com.zilliz.milvustestv2.utils.PropertyFilesUtil;
8+
import io.milvus.client.MilvusServiceClient;
9+
import io.milvus.param.ConnectParam;
810
import io.milvus.param.MetricType;
911
import io.milvus.v2.client.ConnectConfig;
1012
import io.milvus.v2.client.MilvusClientV2;

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -742,11 +742,11 @@ public static List<JsonObject> generateSimpleNullData(long startId, long num, in
742742
for (long i = startId; i < (num + startId); i++) {
743743
JsonObject row = new JsonObject();
744744
row.addProperty(CommonData.fieldInt64, i);
745-
row.addProperty(CommonData.fieldInt32, (String) null);
746-
row.addProperty(CommonData.fieldInt16, (int) i % 32767);
747-
row.addProperty(CommonData.fieldInt8, (short) i % 127);
748-
row.addProperty(CommonData.fieldBool, i % 2 == 0);
749-
if (i % 2 == 1) {
745+
if (i % 2 == 0) {
746+
row.addProperty(CommonData.fieldInt32, (int) i % 32767);
747+
row.addProperty(CommonData.fieldInt16, (int) i % 32767);
748+
row.addProperty(CommonData.fieldInt8, (short) i % 127);
749+
row.addProperty(CommonData.fieldBool, i % 3 == 0);
750750
row.addProperty(CommonData.fieldDouble, (double) i);
751751
row.addProperty(CommonData.fieldVarchar, "Str" + i);
752752
row.addProperty(CommonData.fieldFloat, (float) i);
@@ -774,15 +774,15 @@ public static List<JsonObject> generateSimpleNullData(long startId, long num, in
774774
}
775775

776776
JsonObject json = new JsonObject();
777-
json.addProperty(CommonData.fieldInt64, (int) i % 32767);
778-
json.addProperty(CommonData.fieldInt32, (int) i % 32767);
779-
json.addProperty(CommonData.fieldDouble, (double) i);
780-
json.add(CommonData.fieldArray, gson.toJsonTree(Arrays.asList(i, i + 1, i + 2)));
781-
json.addProperty(CommonData.fieldBool, i % 2 == 0);
782-
if (i % 2 == 1) {
777+
if (i % 2 == 0) {
778+
json.addProperty(CommonData.fieldInt64, (int) i % 32767);
779+
json.addProperty(CommonData.fieldInt32, (int) i % 32767);
780+
json.addProperty(CommonData.fieldDouble, (double) i);
781+
json.add(CommonData.fieldArray, gson.toJsonTree(Arrays.asList(i, i + 1, i + 2)));
782+
json.addProperty(CommonData.fieldBool, i % 3 == 0);
783783
json.addProperty(CommonData.fieldVarchar, "Str" + i);
784+
json.addProperty(CommonData.fieldFloat, (float) i);
784785
}
785-
json.addProperty(CommonData.fieldFloat, (float) i);
786786
row.add(CommonData.fieldJson, json);
787787
jsonList.add(row);
788788
}
@@ -1542,7 +1542,7 @@ public static List<List<String>> providerBatchFiles(String collection, BulkFileT
15421542
CreateCollectionReq.CollectionSchema collectionSchema = describeCollectionResp.getCollectionSchema();
15431543
RemoteBulkWriter remoteBulkWriter = buildRemoteBulkWriter(collectionSchema, bulkFileType);
15441544
List<JsonObject> jsonObjects = CommonFunction.genCommonData(collection, count);
1545-
jsonObjects.forEach(x->{
1545+
jsonObjects.forEach(x -> {
15461546
try {
15471547
remoteBulkWriter.appendRow(x);
15481548
} catch (IOException | InterruptedException e) {

tests/milvustestv2/src/test/java/com/zilliz/milvustestv2/alias/AlterAliasTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ public void providerCollection() {
3939
@AfterClass(alwaysRun = true)
4040
public void cleanTestData(){
4141
milvusClientV2.dropCollection(DropCollectionReq.builder().collectionName(newCollectionName).build());
42-
milvusClientV2.dropCollection(DropCollectionReq.builder().collectionName(newCollectionName2).build());
42+
// remove alias before drop collection
4343
milvusClientV2.dropAlias(DropAliasReq.builder().alias(aliasName).build());
44+
milvusClientV2.dropCollection(DropCollectionReq.builder().collectionName(newCollectionName2).build());
4445
}
4546

4647
@Test(description = "Alter alias test",groups = {"Smoke"})

tests/milvustestv2/src/test/java/com/zilliz/milvustestv2/alias/CreateAliasTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import io.milvus.v2.service.collection.request.DropCollectionReq;
1111
import io.milvus.v2.service.index.request.CreateIndexReq;
1212
import io.milvus.v2.service.utility.request.CreateAliasReq;
13+
import io.milvus.v2.service.utility.request.DropAliasReq;
1314
import io.milvus.v2.service.utility.request.ListAliasesReq;
1415
import io.milvus.v2.service.utility.response.ListAliasResp;
1516
import io.milvus.v2.service.vector.request.InsertReq;
@@ -49,6 +50,7 @@ public void providerCollection(){
4950

5051
@AfterClass(alwaysRun = true)
5152
public void cleanTestData(){
53+
milvusClientV2.dropAlias(DropAliasReq.builder().alias(aliasName).build());
5254
milvusClientV2.dropCollection(DropCollectionReq.builder().collectionName(newCollectionName).build());
5355
}
5456

0 commit comments

Comments
 (0)