Skip to content

milvus
milvus

BaiXuePrincess / milvus
与 Fork 源项目一致

从无法访问的项目Fork

通知 7
Star 4
Fork 0
milvus
milvus

体验新版 GitCode，发现更多精彩内容 >>

提交 dc65c2b2 编写于 作者: Z zhenwu
浏览文件
操作

update java-tests and classified python-tests by opensource and internal case 


Former-commit-id: 04179450a13c7ec75b1065122049474c8d2b6d73
上级 9c88a0f6
隐藏空白更改
内联 并排
Showing with 218 addition and 253 deletion
tests/milvus-java-test/pom.xml
浏览文件 @ dc65c2b2
......@@ -99,12 +99,12 @@
<dependency>
<groupId>io.milvus</groupId>
<artifactId>milvus-sdk-java</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.2.0-SNAPSHOT</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>io.grpc</groupId>-->
<!-- <artifactId>grpc-netty-shaded</artifactId>-->
<!-- <artifactId>grpc-netty-sher staded</artifactId>-->
<!-- <scope>runtime</scope>-->
<!-- </dependency>-->
<!-- <dependency>-->
......@@ -134,4 +134,4 @@
</dependencies>
</project>
</project>
\ No newline at end of file
tests/milvus-java-test/src/main/java/com/MainClass.java
浏览文件 @ dc65c2b2
......@@ -16,8 +16,8 @@ import java.util.List;
public class MainClass {
private static String host = "127.0.0.1";
private static String port = "19530";
public Integer index_file_size = 50;
public Integer dimension = 128;
private int index_file_size = 50;
public int dimension = 128;
public static void setHost(String host) {
MainClass.host = host;
......@@ -65,8 +65,8 @@ public class MainClass {
@DataProvider(name="Table")
public Object[][] provideTable() throws ConnectFailedException {
Object[][] tables = new Object[2][2];
MetricType metricTypes[] = { MetricType.L2, MetricType.IP };
for (Integer i = 0; i < metricTypes.length; ++i) {
MetricType[] metricTypes = { MetricType.L2, MetricType.IP };
for (int i = 0; i < metricTypes.length; ++i) {
String tableName = metricTypes[i].toString()+"_"+RandomStringUtils.randomAlphabetic(10);
// Generate connection instance
MilvusClient client = new MilvusGrpcClient();
......@@ -79,8 +79,7 @@ public class MainClass {
.withIndexFileSize(index_file_size)
.withMetricType(metricTypes[i])
.build();
TableSchemaParam tableSchemaParam = new TableSchemaParam.Builder(tableSchema).build();
Response res = client.createTable(tableSchemaParam);
Response res = client.createTable(tableSchema);
if (!res.ok()) {
System.out.println(res.getMessage());
throw new SkipException("Table created failed");
......
tests/milvus-java-test/src/main/java/com/TestAddVectors.java
浏览文件 @ dc65c2b2
......@@ -3,7 +3,6 @@ package com;
import io.milvus.client.InsertParam;
import io.milvus.client.InsertResponse;
import io.milvus.client.MilvusClient;
import io.milvus.client.TableParam;
import org.testng.Assert;
import org.testng.annotations.Test;
......@@ -55,19 +54,18 @@ public class TestAddVectors {
assert(res.getResponse().ok());
Thread.currentThread().sleep(1000);
// Assert table row count
TableParam tableParam = new TableParam.Builder(tableName).build();
Assert.assertEquals(client.getTableRowCount(tableParam).getTableRowCount(), nb);
Assert.assertEquals(client.getTableRowCount(tableName).getTableRowCount(), nb);
}
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_add_vectors_timeout(MilvusClient client, String tableName) throws InterruptedException {
int nb = 200000;
List<List<Float>> vectors = gen_vectors(nb);
System.out.println(new Date());
InsertParam insertParam = new InsertParam.Builder(tableName, vectors).withTimeout(1).build();
InsertResponse res = client.insert(insertParam);
assert(!res.getResponse().ok());
}
// @Test(dataProvider = "Table", dataProviderClass = MainClass.class)
// public void test_add_vectors_timeout(MilvusClient client, String tableName) throws InterruptedException {
// int nb = 200000;
// List<List<Float>> vectors = gen_vectors(nb);
// System.out.println(new Date());
// InsertParam insertParam = new InsertParam.Builder(tableName, vectors).withTimeout(1).build();
// InsertResponse res = client.insert(insertParam);
// assert(!res.getResponse().ok());
// }
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_add_vectors_big_data(MilvusClient client, String tableName) throws InterruptedException {
......@@ -91,10 +89,9 @@ public class TestAddVectors {
InsertParam insertParam = new InsertParam.Builder(tableName, vectors).withVectorIds(vectorIds).build();
InsertResponse res = client.insert(insertParam);
assert(res.getResponse().ok());
Thread.currentThread().sleep(1000);
Thread.currentThread().sleep(2000);
// Assert table row count
TableParam tableParam = new TableParam.Builder(tableName).build();
Assert.assertEquals(client.getTableRowCount(tableParam).getTableRowCount(), nb);
Assert.assertEquals(client.getTableRowCount(tableName).getTableRowCount(), nb);
}
// TODO: MS-628
......@@ -147,8 +144,7 @@ public class TestAddVectors {
}
Thread.currentThread().sleep(1000);
// Assert table row count
TableParam tableParam = new TableParam.Builder(tableName).build();
Assert.assertEquals(client.getTableRowCount(tableParam).getTableRowCount(), nb * loops);
Assert.assertEquals(client.getTableRowCount(tableName).getTableRowCount(), nb * loops);
}
}
tests/milvus-java-test/src/main/java/com/TestDeleteVectors.java
浏览文件 @ dc65c2b2
package com;
import io.milvus.client.*;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.*;
public class TestDeleteVectors {
......@@ -31,92 +27,90 @@ public class TestDeleteVectors {
return c.getTime();
}
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_delete_vectors(MilvusClient client, String tableName) throws InterruptedException {
int nb = 10000;
List<List<Float>> vectors = gen_vectors(nb);
// Add vectors
InsertParam insertParam = new InsertParam.Builder(tableName, vectors).build();
InsertResponse res = client.insert(insertParam);
assert(res.getResponse().ok());
Thread.sleep(1000);
DateRange dateRange = new DateRange(getDeltaDate(-1), getDeltaDate(1));
DeleteByRangeParam param = new DeleteByRangeParam.Builder(dateRange, tableName).build();
Response res_delete = client.deleteByRange(param);
assert(res_delete.ok());
Thread.sleep(1000);
// Assert table row count
TableParam tableParam = new TableParam.Builder(tableName).build();
Assert.assertEquals(client.getTableRowCount(tableParam).getTableRowCount(), 0);
}
// @Test(dataProvider = "Table", dataProviderClass = MainClass.class)
// public void test_delete_vectors(MilvusClient client, String tableName) throws InterruptedException {
// int nb = 10000;
// List<List<Float>> vectors = gen_vectors(nb);
// // Add vectors
// InsertParam insertParam = new InsertParam.Builder(tableName, vectors).build();
// InsertResponse res = client.insert(insertParam);
// assert(res.getResponse().ok());
// Thread.sleep(1000);
// DateRange dateRange = new DateRange(getDeltaDate(-1), getDeltaDate(1));
// DeleteByRangeParam param = new DeleteByRangeParam.Builder(dateRange, tableName).build();
// Response res_delete = client.deleteByRange(param);
// assert(res_delete.ok());
// Thread.sleep(1000);
// // Assert table row count
// Assert.assertEquals(client.getTableRowCount(tableParam).getTableRowCount(), 0);
// }
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_delete_vectors_table_not_existed(MilvusClient client, String tableName) throws InterruptedException {
String tableNameNew = tableName + "_";
DateRange dateRange = new DateRange(getDeltaDate(-1), getDeltaDate(1));
DeleteByRangeParam param = new DeleteByRangeParam.Builder(dateRange, tableNameNew).build();
Response res_delete = client.deleteByRange(param);
assert(!res_delete.ok());
}
// @Test(dataProvider = "Table", dataProviderClass = MainClass.class)
// public void test_delete_vectors_table_not_existed(MilvusClient client, String tableName) throws InterruptedException {
// String tableNameNew = tableName + "_";
// DateRange dateRange = new DateRange(getDeltaDate(-1), getDeltaDate(1));
// DeleteByRangeParam param = new DeleteByRangeParam.Builder(dateRange, tableNameNew).build();
// Response res_delete = client.deleteByRange(param);
// assert(!res_delete.ok());
// }
@Test(dataProvider = "DisConnectInstance", dataProviderClass = MainClass.class)
public void test_delete_vectors_without_connect(MilvusClient client, String tableName) throws InterruptedException {
DateRange dateRange = new DateRange(getDeltaDate(-1), getDeltaDate(1));
DeleteByRangeParam param = new DeleteByRangeParam.Builder(dateRange, tableName).build();
Response res_delete = client.deleteByRange(param);
assert(!res_delete.ok());
}
// @Test(dataProvider = "DisConnectInstance", dataProviderClass = MainClass.class)
// public void test_delete_vectors_without_connect(MilvusClient client, String tableName) throws InterruptedException {
// DateRange dateRange = new DateRange(getDeltaDate(-1), getDeltaDate(1));
// DeleteByRangeParam param = new DeleteByRangeParam.Builder(dateRange, tableName).build();
// Response res_delete = client.deleteByRange(param);
// assert(!res_delete.ok());
// }
//
// @Test(dataProvider = "Table", dataProviderClass = MainClass.class)
// public void test_delete_vectors_table_empty(MilvusClient client, String tableName) throws InterruptedException {
// DateRange dateRange = new DateRange(getDeltaDate(-1), getDeltaDate(1));
// DeleteByRangeParam param = new DeleteByRangeParam.Builder(dateRange, tableName).build();
// Response res_delete = client.deleteByRange(param);
// assert(res_delete.ok());
// }
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_delete_vectors_table_empty(MilvusClient client, String tableName) throws InterruptedException {
DateRange dateRange = new DateRange(getDeltaDate(-1), getDeltaDate(1));
DeleteByRangeParam param = new DeleteByRangeParam.Builder(dateRange, tableName).build();
Response res_delete = client.deleteByRange(param);
assert(res_delete.ok());
}
// @Test(dataProvider = "Table", dataProviderClass = MainClass.class)
// public void test_delete_vectors_invalid_date_range(MilvusClient client, String tableName) throws InterruptedException {
// int nb = 100;
// List<List<Float>> vectors = gen_vectors(nb);
// // Add vectors
// InsertParam insertParam = new InsertParam.Builder(tableName, vectors).build();
// InsertResponse res = client.insert(insertParam);
// assert(res.getResponse().ok());
// Thread.sleep(1000);
// DateRange dateRange = new DateRange(getDeltaDate(1), getDeltaDate(0));
// DeleteByRangeParam param = new DeleteByRangeParam.Builder(dateRange, tableName).build();
// Response res_delete = client.deleteByRange(param);
// assert(!res_delete.ok());
// }
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_delete_vectors_invalid_date_range(MilvusClient client, String tableName) throws InterruptedException {
int nb = 100;
List<List<Float>> vectors = gen_vectors(nb);
// Add vectors
InsertParam insertParam = new InsertParam.Builder(tableName, vectors).build();
InsertResponse res = client.insert(insertParam);
assert(res.getResponse().ok());
Thread.sleep(1000);
DateRange dateRange = new DateRange(getDeltaDate(1), getDeltaDate(0));
DeleteByRangeParam param = new DeleteByRangeParam.Builder(dateRange, tableName).build();
Response res_delete = client.deleteByRange(param);
assert(!res_delete.ok());
}
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_delete_vectors_invalid_date_range_1(MilvusClient client, String tableName) throws InterruptedException {
int nb = 100;
List<List<Float>> vectors = gen_vectors(nb);
InsertParam insertParam = new InsertParam.Builder(tableName, vectors).build();
InsertResponse res = client.insert(insertParam);
assert(res.getResponse().ok());
DateRange dateRange = new DateRange(getDeltaDate(2), getDeltaDate(-1));
DeleteByRangeParam param = new DeleteByRangeParam.Builder(dateRange, tableName).build();
Response res_delete = client.deleteByRange(param);
assert(!res_delete.ok());
}
// @Test(dataProvider = "Table", dataProviderClass = MainClass.class)
// public void test_delete_vectors_invalid_date_range_1(MilvusClient client, String tableName) throws InterruptedException {
// int nb = 100;
// List<List<Float>> vectors = gen_vectors(nb);
// InsertParam insertParam = new InsertParam.Builder(tableName, vectors).build();
// InsertResponse res = client.insert(insertParam);
// assert(res.getResponse().ok());
// DateRange dateRange = new DateRange(getDeltaDate(2), getDeltaDate(-1));
// DeleteByRangeParam param = new DeleteByRangeParam.Builder(dateRange, tableName).build();
// Response res_delete = client.deleteByRange(param);
// assert(!res_delete.ok());
// }
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_delete_vectors_no_result(MilvusClient client, String tableName) throws InterruptedException {
int nb = 100;
List<List<Float>> vectors = gen_vectors(nb);
InsertParam insertParam = new InsertParam.Builder(tableName, vectors).build();
InsertResponse res = client.insert(insertParam);
assert(res.getResponse().ok());
Thread.sleep(1000);
DateRange dateRange = new DateRange(getDeltaDate(-3), getDeltaDate(-2));
DeleteByRangeParam param = new DeleteByRangeParam.Builder(dateRange, tableName).build();
Response res_delete = client.deleteByRange(param);
assert(res_delete.ok());
TableParam tableParam = new TableParam.Builder(tableName).build();
Assert.assertEquals(client.getTableRowCount(tableParam).getTableRowCount(), nb);
}
// @Test(dataProvider = "Table", dataProviderClass = MainClass.class)
// public void test_delete_vectors_no_result(MilvusClient client, String tableName) throws InterruptedException {
// int nb = 100;
// List<List<Float>> vectors = gen_vectors(nb);
// InsertParam insertParam = new InsertParam.Builder(tableName, vectors).build();
// InsertResponse res = client.insert(insertParam);
// assert(res.getResponse().ok());
// Thread.sleep(1000);
// DateRange dateRange = new DateRange(getDeltaDate(-3), getDeltaDate(-2));
// DeleteByRangeParam param = new DeleteByRangeParam.Builder(dateRange, tableName).build();
// Response res_delete = client.deleteByRange(param);
// assert(res_delete.ok());
// Assert.assertEquals(client.getTableRowCount(tableParam).getTableRowCount(), nb);
// }
}
tests/milvus-java-test/src/main/java/com/TestIndex.java
浏览文件 @ dc65c2b2
......@@ -4,7 +4,6 @@ import io.milvus.client.*;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.Random;
......@@ -56,8 +55,7 @@ public class TestIndex {
Response res_create = client.createIndex(createIndexParam);
res_create = client.createIndex(createIndexParam);
assert(res_create.ok());
TableParam tableParam = new TableParam.Builder(tableName).build();
DescribeIndexResponse res = client.describeIndex(tableParam);
DescribeIndexResponse res = client.describeIndex(tableName);
assert(res.getResponse().ok());
Index index1 = res.getIndex().get();
Assert.assertEquals(index1.getNList(), n_list);
......@@ -76,29 +74,27 @@ public class TestIndex {
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
Response res_create = client.createIndex(createIndexParam);
assert(res_create.ok());
TableParam tableParam = new TableParam.Builder(tableName).build();
DescribeIndexResponse res = client.describeIndex(tableParam);
DescribeIndexResponse res = client.describeIndex(tableName);
assert(res.getResponse().ok());
Index index1 = res.getIndex().get();
Assert.assertEquals(index1.getIndexType(), indexType);
}
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_create_index_FLAT_timeout(MilvusClient client, String tableName) throws InterruptedException {
int nb = 500000;
IndexType indexType = IndexType.IVF_SQ8;
List<List<Float>> vectors = gen_vectors(nb);
InsertParam insertParam = new InsertParam.Builder(tableName, vectors).build();
client.insert(insertParam);
Index index = new Index.Builder().withIndexType(indexType)
.withNList(n_list)
.build();
System.out.println(new Date());
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).withTimeout(1).build();
Response res_create = client.createIndex(createIndexParam);
assert(!res_create.ok());
}
// @Test(dataProvider = "Table", dataProviderClass = MainClass.class)
// public void test_create_index_FLAT_timeout(MilvusClient client, String tableName) throws InterruptedException {
// int nb = 500000;
// IndexType indexType = IndexType.IVF_SQ8;
// List<List<Float>> vectors = gen_vectors(nb);
// InsertParam insertParam = new InsertParam.Builder(tableName, vectors).build();
// client.insert(insertParam);
// Index index = new Index.Builder().withIndexType(indexType)
// .withNList(n_list)
// .build();
// System.out.println(new Date());
// CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).withTimeout(1).build();
// Response res_create = client.createIndex(createIndexParam);
// assert(!res_create.ok());
// }
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_create_index_IVFLAT(MilvusClient client, String tableName) throws InterruptedException {
......@@ -112,8 +108,7 @@ public class TestIndex {
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
Response res_create = client.createIndex(createIndexParam);
assert(res_create.ok());
TableParam tableParam = new TableParam.Builder(tableName).build();
DescribeIndexResponse res = client.describeIndex(tableParam);
DescribeIndexResponse res = client.describeIndex(tableName);
assert(res.getResponse().ok());
Index index1 = res.getIndex().get();
Assert.assertEquals(index1.getIndexType(), indexType);
......@@ -131,8 +126,7 @@ public class TestIndex {
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
Response res_create = client.createIndex(createIndexParam);
assert(res_create.ok());
TableParam tableParam = new TableParam.Builder(tableName).build();
DescribeIndexResponse res = client.describeIndex(tableParam);
DescribeIndexResponse res = client.describeIndex(tableName);
assert(res.getResponse().ok());
Index index1 = res.getIndex().get();
Assert.assertEquals(index1.getIndexType(), indexType);
......@@ -150,8 +144,7 @@ public class TestIndex {
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
Response res_create = client.createIndex(createIndexParam);
assert(res_create.ok());
TableParam tableParam = new TableParam.Builder(tableName).build();
DescribeIndexResponse res = client.describeIndex(tableParam);
DescribeIndexResponse res = client.describeIndex(tableName);
assert(res.getResponse().ok());
Index index1 = res.getIndex().get();
Assert.assertEquals(index1.getIndexType(), indexType);
......@@ -213,8 +206,7 @@ public class TestIndex {
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
Response res_create = client.createIndex(createIndexParam);
assert(res_create.ok());
TableParam tableParam = new TableParam.Builder(tableName).build();
DescribeIndexResponse res = client.describeIndex(tableParam);
DescribeIndexResponse res = client.describeIndex(tableName);
assert(res.getResponse().ok());
Index index1 = res.getIndex().get();
Assert.assertEquals(index1.getNList(), n_list);
......@@ -232,7 +224,6 @@ public class TestIndex {
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
Response res_create = client.createIndex(createIndexParam);
assert(res_create.ok());
TableParam tableParam = new TableParam.Builder(tableName).build();
// Create another index
IndexType indexTypeNew = IndexType.IVFLAT;
int n_list_new = n_list + 1;
......@@ -242,7 +233,7 @@ public class TestIndex {
CreateIndexParam createIndexParamNew = new CreateIndexParam.Builder(tableName).withIndex(index_new).build();
Response res_create_new = client.createIndex(createIndexParamNew);
assert(res_create_new.ok());
DescribeIndexResponse res = client.describeIndex(tableParam);
DescribeIndexResponse res = client.describeIndex(tableName);
assert(res_create.ok());
Index index1 = res.getIndex().get();
Assert.assertEquals(index1.getNList(), n_list_new);
......@@ -252,15 +243,13 @@ public class TestIndex {
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_describe_index_table_not_existed(MilvusClient client, String tableName) throws InterruptedException {
String tableNameNew = tableName + "_";
TableParam tableParam = new TableParam.Builder(tableNameNew).build();
DescribeIndexResponse res = client.describeIndex(tableParam);
DescribeIndexResponse res = client.describeIndex(tableNameNew);
assert(!res.getResponse().ok());
}
@Test(dataProvider = "DisConnectInstance", dataProviderClass = MainClass.class)
public void test_describe_index_without_connect(MilvusClient client, String tableName) throws InterruptedException {
TableParam tableParam = new TableParam.Builder(tableName).build();
DescribeIndexResponse res = client.describeIndex(tableParam);
DescribeIndexResponse res = client.describeIndex(tableName);
assert(!res.getResponse().ok());
}
......@@ -275,10 +264,9 @@ public class TestIndex {
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
Response res_create = client.createIndex(createIndexParam);
assert(res_create.ok());
TableParam tableParam = new TableParam.Builder(tableName).build();
Response res_drop = client.dropIndex(tableParam);
Response res_drop = client.dropIndex(tableName);
assert(res_drop.ok());
DescribeIndexResponse res = client.describeIndex(tableParam);
DescribeIndexResponse res = client.describeIndex(tableName);
assert(res.getResponse().ok());
Index index1 = res.getIndex().get();
Assert.assertEquals(index1.getNList(), default_n_list);
......@@ -296,11 +284,10 @@ public class TestIndex {
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
Response res_create = client.createIndex(createIndexParam);
assert(res_create.ok());
TableParam tableParam = new TableParam.Builder(tableName).build();
Response res_drop = client.dropIndex(tableParam);
res_drop = client.dropIndex(tableParam);
Response res_drop = client.dropIndex(tableName);
res_drop = client.dropIndex(tableName);
assert(res_drop.ok());
DescribeIndexResponse res = client.describeIndex(tableParam);
DescribeIndexResponse res = client.describeIndex(tableName);
assert(res.getResponse().ok());
Index index1 = res.getIndex().get();
Assert.assertEquals(index1.getNList(), default_n_list);
......@@ -310,15 +297,13 @@ public class TestIndex {
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_drop_index_table_not_existed(MilvusClient client, String tableName) throws InterruptedException {
String tableNameNew = tableName + "_";
TableParam tableParam = new TableParam.Builder(tableNameNew).build();
Response res_drop = client.dropIndex(tableParam);
Response res_drop = client.dropIndex(tableNameNew);
assert(!res_drop.ok());
}
@Test(dataProvider = "DisConnectInstance", dataProviderClass = MainClass.class)
public void test_drop_index_without_connect(MilvusClient client, String tableName) throws InterruptedException {
TableParam tableParam = new TableParam.Builder(tableName).build();
Response res_drop = client.dropIndex(tableParam);
Response res_drop = client.dropIndex(tableName);
assert(!res_drop.ok());
}
......@@ -327,10 +312,9 @@ public class TestIndex {
List<List<Float>> vectors = gen_vectors(nb);
InsertParam insertParam = new InsertParam.Builder(tableName, vectors).build();
client.insert(insertParam);
TableParam tableParam = new TableParam.Builder(tableName).build();
Response res_drop = client.dropIndex(tableParam);
Response res_drop = client.dropIndex(tableName);
assert(res_drop.ok());
DescribeIndexResponse res = client.describeIndex(tableParam);
DescribeIndexResponse res = client.describeIndex(tableName);
assert(res.getResponse().ok());
Index index1 = res.getIndex().get();
Assert.assertEquals(index1.getNList(), default_n_list);
......
tests/milvus-java-test/src/main/java/com/TestMix.java
浏览文件 @ dc65c2b2
......@@ -116,8 +116,7 @@ public class TestMix {
executor.shutdown();
Thread.sleep(2000);
TableParam tableParam = new TableParam.Builder(tableName).build();
GetTableRowCountResponse getTableRowCountResponse = client.getTableRowCount(tableParam);
GetTableRowCountResponse getTableRowCountResponse = client.getTableRowCount(tableName);
Assert.assertEquals(getTableRowCountResponse.getTableRowCount(), thread_num * nb);
}
......@@ -142,8 +141,7 @@ public class TestMix {
executor.awaitQuiescence(300, TimeUnit.SECONDS);
executor.shutdown();
Thread.sleep(2000);
TableParam tableParam = new TableParam.Builder(tableName).build();
GetTableRowCountResponse getTableRowCountResponse = client.getTableRowCount(tableParam);
GetTableRowCountResponse getTableRowCountResponse = client.getTableRowCount(tableName);
Assert.assertEquals(getTableRowCountResponse.getTableRowCount(), thread_num * nb);
}
......@@ -180,8 +178,7 @@ public class TestMix {
executor.awaitQuiescence(300, TimeUnit.SECONDS);
executor.shutdown();
Thread.sleep(2000);
TableParam tableParam = new TableParam.Builder(tableName).build();
GetTableRowCountResponse getTableRowCountResponse = client.getTableRowCount(tableParam);
GetTableRowCountResponse getTableRowCountResponse = client.getTableRowCount(tableName);
Assert.assertEquals(getTableRowCountResponse.getTableRowCount(), thread_num * nb);
}
......@@ -209,12 +206,10 @@ public class TestMix {
.withIndexFileSize(index_file_size)
.withMetricType(MetricType.IP)
.build();
TableSchemaParam tableSchemaParam = new TableSchemaParam.Builder(tableSchema).build();
client.createTable(tableSchemaParam);
client.createTable(tableSchema);
InsertParam insertParam = new InsertParam.Builder(tableName, vectors).build();
client.insert(insertParam);
TableParam tableParam = new TableParam.Builder(tableName).build();
Response response = client.dropTable(tableParam);
Response response = client.dropTable(tableName);
Assert.assertTrue(response.ok());
try {
client.disconnect();
......
tests/milvus-java-test/src/main/java/com/TestSearchVectors.java
浏览文件 @ dc65c2b2
......@@ -77,7 +77,6 @@ public class TestSearchVectors {
.build();
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
client.createIndex(createIndexParam);
TableParam tableParam = new TableParam.Builder(tableName).build();
SearchParam searchParam = new SearchParam.Builder(tableName, queryVectors).withNProbe(n_probe).withTopK(top_k).build();
List<List<SearchResponse.QueryResult>> res_search = client.search(searchParam).getQueryResultsList();
Assert.assertEquals(res_search.size(), nq);
......@@ -101,7 +100,6 @@ public class TestSearchVectors {
.build();
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
client.createIndex(createIndexParam);
TableParam tableParam = new TableParam.Builder(tableName).build();
SearchParam searchParam = new SearchParam.Builder(tableName, queryVectors).withNProbe(n_probe).withTopK(top_k).build();
List<List<SearchResponse.QueryResult>> res_search = client.search(searchParam).getQueryResultsList();
Assert.assertEquals(res_search.get(0).get(0).getVectorId(), 0L);
......@@ -115,7 +113,7 @@ public class TestSearchVectors {
List<List<Float>> queryVectors = vectors.subList(0,nq);
InsertParam insertParam = new InsertParam.Builder(tableName, vectors).build();
client.insert(insertParam);
Thread.sleep(1000);
Thread.sleep(2000);
SearchParam searchParam = new SearchParam.Builder(tableName, queryVectors).withNProbe(n_probe).withTopK(top_k).build();
List<List<SearchResponse.QueryResult>> res_search = client.search(searchParam).getQueryResultsList();
Assert.assertEquals(res_search.size(), nq);
......@@ -135,7 +133,6 @@ public class TestSearchVectors {
.build();
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
client.createIndex(createIndexParam);
TableParam tableParam = new TableParam.Builder(tableName).build();
SearchParam searchParam = new SearchParam.Builder(tableName, queryVectors).withNProbe(n_probe).withTopK(top_k).build();
List<List<SearchResponse.QueryResult>> res_search = client.search(searchParam).getQueryResultsList();
double distance = res_search.get(0).get(0).getDistance();
......@@ -159,7 +156,6 @@ public class TestSearchVectors {
.build();
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
client.createIndex(createIndexParam);
TableParam tableParam = new TableParam.Builder(tableName).build();
SearchParam searchParam = new SearchParam.Builder(tableName, queryVectors).withNProbe(n_probe).withTopK(top_k).build();
List<List<SearchResponse.QueryResult>> res_search = client.search(searchParam).getQueryResultsList();
Assert.assertEquals(res_search.size(), nq);
......@@ -195,7 +191,6 @@ public class TestSearchVectors {
.build();
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
client.createIndex(createIndexParam);
TableParam tableParam = new TableParam.Builder(tableName).build();
SearchParam searchParam = new SearchParam.Builder(tableName, queryVectors).withNProbe(n_probe).withTopK(top_k).build();
List<List<Double>> res_search = client.search(searchParam).getResultDistancesList();
for (int i = 0; i < nq; i++) {
......@@ -222,7 +217,6 @@ public class TestSearchVectors {
.build();
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
client.createIndex(createIndexParam);
TableParam tableParam = new TableParam.Builder(tableName).build();
SearchParam searchParam = new SearchParam.Builder(tableName, queryVectors).withNProbe(n_probe).withTopK(top_k).build();
List<List<SearchResponse.QueryResult>> res_search = client.search(searchParam).getQueryResultsList();
Assert.assertEquals(res_search.size(), nq);
......@@ -244,22 +238,23 @@ public class TestSearchVectors {
Assert.assertEquals(res_search.get(0).size(), top_k);
}
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_search_FLAT_timeout(MilvusClient client, String tableName) throws InterruptedException {
IndexType indexType = IndexType.FLAT;
int nb = 100000;
int nq = 1000;
int top_k = 2048;
List<List<Float>> vectors = gen_vectors(nb, false);
List<List<Float>> queryVectors = vectors.subList(0,nq);
InsertParam insertParam = new InsertParam.Builder(tableName, vectors).build();
client.insert(insertParam);
Thread.sleep(1000);
SearchParam searchParam = new SearchParam.Builder(tableName, queryVectors).withNProbe(n_probe).withTopK(top_k).withTimeout(1).build();
System.out.println(new Date());
SearchResponse res_search = client.search(searchParam);
assert (!res_search.getResponse().ok());
}
// @Test(dataProvider = "Table", dataProviderClass = MainClass.class)
// public void test_search_FLAT_timeout(MilvusClient client, String tableName) throws InterruptedException {
// IndexType indexType = IndexType.FLAT;
// int nb = 100000;
// int nq = 1000;
// int top_k = 2048;
// List<List<Float>> vectors = gen_vectors(nb, false);
// List<List<Float>> vectors = gen_vectors(nb, false);
// List<List<Float>> queryVectors = vectors.subList(0,nq);
// InsertParam insertParam = new InsertParam.Builder(tableName, vectors).build();
// client.insert(insertParam);
// Thread.sleep(1000);
// SearchParam searchParam = new SearchParam.Builder(tableName, queryVectors).withNProbe(n_probe).withTopK(top_k).withTimeout(1).build();
// System.out.println(new Date());
// SearchResponse res_search = client.search(searchParam);
// assert (!res_search.getResponse().ok());
// }
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_search_FLAT_big_data_size(MilvusClient client, String tableName) throws InterruptedException {
......@@ -315,7 +310,6 @@ public class TestSearchVectors {
.build();
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
client.createIndex(createIndexParam);
TableParam tableParam = new TableParam.Builder(tableName).build();
SearchParam searchParam = new SearchParam.Builder(tableName, queryVectors).withNProbe(n_probe_new).withTopK(top_k).build();
SearchResponse res_search = client.search(searchParam);
assert (!res_search.getResponse().ok());
......@@ -335,7 +329,6 @@ public class TestSearchVectors {
.build();
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
client.createIndex(createIndexParam);
TableParam tableParam = new TableParam.Builder(tableName).build();
SearchParam searchParam = new SearchParam.Builder(tableName, queryVectors).withNProbe(n_probe).withTopK(top_k_new).build();
SearchResponse res_search = client.search(searchParam);
assert (!res_search.getResponse().ok());
......@@ -374,7 +367,6 @@ public class TestSearchVectors {
.build();
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
client.createIndex(createIndexParam);
TableParam tableParam = new TableParam.Builder(tableName).build();
SearchParam searchParam = new SearchParam.Builder(tableName, queryVectors).withNProbe(n_probe).withTopK(top_k).withDateRanges(dateRange).build();
SearchResponse res_search = client.search(searchParam);
assert (res_search.getResponse().ok());
......@@ -416,7 +408,6 @@ public class TestSearchVectors {
.build();
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
client.createIndex(createIndexParam);
TableParam tableParam = new TableParam.Builder(tableName).build();
SearchParam searchParam = new SearchParam.Builder(tableName, queryVectors).withNProbe(n_probe).withTopK(top_k).withDateRanges(dateRange).build();
SearchResponse res_search = client.search(searchParam);
assert (res_search.getResponse().ok());
......@@ -456,7 +447,6 @@ public class TestSearchVectors {
.build();
CreateIndexParam createIndexParam = new CreateIndexParam.Builder(tableName).withIndex(index).build();
client.createIndex(createIndexParam);
TableParam tableParam = new TableParam.Builder(tableName).build();
SearchParam searchParam = new SearchParam.Builder(tableName, queryVectors).withNProbe(n_probe).withTopK(top_k).withDateRanges(dateRange).build();
SearchResponse res_search = client.search(searchParam);
assert (!res_search.getResponse().ok());
......
tests/milvus-java-test/src/main/java/com/TestTable.java
浏览文件 @ dc65c2b2
......@@ -17,8 +17,7 @@ public class TestTable {
.withIndexFileSize(index_file_size)
.withMetricType(MetricType.L2)
.build();
TableSchemaParam tableSchemaParam = new TableSchemaParam.Builder(tableSchema).build();
Response res = client.createTable(tableSchemaParam);
Response res = client.createTable(tableSchema);
assert(res.ok());
Assert.assertEquals(res.ok(), true);
}
......@@ -29,8 +28,7 @@ public class TestTable {
.withIndexFileSize(index_file_size)
.withMetricType(MetricType.L2)
.build();
TableSchemaParam tableSchemaParam = new TableSchemaParam.Builder(tableSchema).build();
Response res = client.createTable(tableSchemaParam);
Response res = client.createTable(tableSchema);
assert(!res.ok());
}
......@@ -40,10 +38,9 @@ public class TestTable {
.withIndexFileSize(index_file_size)
.withMetricType(MetricType.L2)
.build();
TableSchemaParam tableSchemaParam = new TableSchemaParam.Builder(tableSchema).build();
Response res = client.createTable(tableSchemaParam);
Response res = client.createTable(tableSchema);
Assert.assertEquals(res.ok(), true);
Response res_new = client.createTable(tableSchemaParam);
Response res_new = client.createTable(tableSchema);
Assert.assertEquals(res_new.ok(), false);
}
......@@ -54,8 +51,7 @@ public class TestTable {
.withIndexFileSize(index_file_size)
.withMetricType(MetricType.L2)
.build();
TableSchemaParam tableSchemaParam = new TableSchemaParam.Builder(tableSchema).build();
Response res = client.createTable(tableSchemaParam);
Response res = client.createTable(tableSchema);
System.out.println(res.toString());
Assert.assertEquals(res.ok(), false);
}
......@@ -70,8 +66,7 @@ public class TestTable {
.withIndexFileSize(index_file_size)
.withMetricType(MetricType.L2)
.build();
TableSchemaParam tableSchemaParam = new TableSchemaParam.Builder(tableSchema).build();
client.createTable(tableSchemaParam);
client.createTable(tableSchema);
List<String> tableNames = client.showTables().getTableNames();
Assert.assertTrue(tableNames.contains(tableNameNew));
}
......@@ -85,8 +80,7 @@ public class TestTable {
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_drop_table(MilvusClient client, String tableName) throws InterruptedException {
TableParam tableParam = new TableParam.Builder(tableName).build();
Response res = client.dropTable(tableParam);
Response res = client.dropTable(tableName);
assert(res.ok());
Thread.currentThread().sleep(1000);
List<String> tableNames = client.showTables().getTableNames();
......@@ -95,8 +89,7 @@ public class TestTable {
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_drop_table_not_existed(MilvusClient client, String tableName) throws InterruptedException {
TableParam tableParam = new TableParam.Builder(tableName+"_").build();
Response res = client.dropTable(tableParam);
Response res = client.dropTable(tableName+"_");
assert(!res.ok());
List<String> tableNames = client.showTables().getTableNames();
Assert.assertTrue(tableNames.contains(tableName));
......@@ -104,15 +97,13 @@ public class TestTable {
@Test(dataProvider = "DisConnectInstance", dataProviderClass = MainClass.class)
public void test_drop_table_without_connect(MilvusClient client, String tableName) throws InterruptedException {
TableParam tableParam = new TableParam.Builder(tableName).build();
Response res = client.dropTable(tableParam);
Response res = client.dropTable(tableName);
assert(!res.ok());
}
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_describe_table(MilvusClient client, String tableName) throws InterruptedException {
TableParam tableParam = new TableParam.Builder(tableName).build();
DescribeTableResponse res = client.describeTable(tableParam);
DescribeTableResponse res = client.describeTable(tableName);
assert(res.getResponse().ok());
TableSchema tableSchema = res.getTableSchema().get();
Assert.assertEquals(tableSchema.getDimension(), dimension);
......@@ -123,30 +114,26 @@ public class TestTable {
@Test(dataProvider = "DisConnectInstance", dataProviderClass = MainClass.class)
public void test_describe_table_without_connect(MilvusClient client, String tableName) throws InterruptedException {
TableParam tableParam = new TableParam.Builder(tableName).build();
DescribeTableResponse res = client.describeTable(tableParam);
DescribeTableResponse res = client.describeTable(tableName);
assert(!res.getResponse().ok());
}
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_has_table_not_existed(MilvusClient client, String tableName) throws InterruptedException {
TableParam tableParam = new TableParam.Builder(tableName+"_").build();
HasTableResponse res = client.hasTable(tableParam);
HasTableResponse res = client.hasTable(tableName+"_");
assert(res.getResponse().ok());
Assert.assertFalse(res.hasTable());
}
@Test(dataProvider = "DisConnectInstance", dataProviderClass = MainClass.class)
public void test_has_table_without_connect(MilvusClient client, String tableName) throws InterruptedException {
TableParam tableParam = new TableParam.Builder(tableName).build();
HasTableResponse res = client.hasTable(tableParam);
HasTableResponse res = client.hasTable(tableName);
assert(!res.getResponse().ok());
}
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_has_table(MilvusClient client, String tableName) throws InterruptedException {
TableParam tableParam = new TableParam.Builder(tableName).build();
HasTableResponse res = client.hasTable(tableParam);
HasTableResponse res = client.hasTable(tableName);
assert(res.getResponse().ok());
Assert.assertTrue(res.hasTable());
}
......
tests/milvus-java-test/src/main/java/com/TestTableCount.java
浏览文件 @ dc65c2b2
......@@ -27,21 +27,18 @@ public class TestTableCount {
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_table_count_no_vectors(MilvusClient client, String tableName) {
TableParam tableParam = new TableParam.Builder(tableName).build();
Assert.assertEquals(client.getTableRowCount(tableParam).getTableRowCount(), 0);
Assert.assertEquals(client.getTableRowCount(tableName).getTableRowCount(), 0);
}
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
public void test_table_count_table_not_existed(MilvusClient client, String tableName) {
TableParam tableParam = new TableParam.Builder(tableName+"_").build();
GetTableRowCountResponse res = client.getTableRowCount(tableParam);
GetTableRowCountResponse res = client.getTableRowCount(tableName+"_");
assert(!res.getResponse().ok());
}
@Test(dataProvider = "DisConnectInstance", dataProviderClass = MainClass.class)
public void test_table_count_without_connect(MilvusClient client, String tableName) {
TableParam tableParam = new TableParam.Builder(tableName+"_").build();
GetTableRowCountResponse res = client.getTableRowCount(tableParam);
GetTableRowCountResponse res = client.getTableRowCount(tableName+"_");
assert(!res.getResponse().ok());
}
......@@ -52,9 +49,8 @@ public class TestTableCount {
// Add vectors
InsertParam insertParam = new InsertParam.Builder(tableName, vectors).build();;
client.insert(insertParam);
Thread.currentThread().sleep(1000);
TableParam tableParam = new TableParam.Builder(tableName).build();
Assert.assertEquals(client.getTableRowCount(tableParam).getTableRowCount(), nb);
Thread.currentThread().sleep(2000);
Assert.assertEquals(client.getTableRowCount(tableName).getTableRowCount(), nb);
}
@Test(dataProvider = "Table", dataProviderClass = MainClass.class)
......@@ -69,8 +65,7 @@ public class TestTableCount {
.withIndexFileSize(index_file_size)
.withMetricType(MetricType.L2)
.build();
TableSchemaParam tableSchemaParam = new TableSchemaParam.Builder(tableSchema).build();
client.createTable(tableSchemaParam);
client.createTable(tableSchema);
// Add vectors
InsertParam insertParam = new InsertParam.Builder(tableNameNew, vectors).build();
client.insert(insertParam);
......@@ -78,8 +73,7 @@ public class TestTableCount {
Thread.currentThread().sleep(1000);
for (int i = 0; i < tableNum; ++i) {
String tableNameNew = tableName + "_" + Integer.toString(i);
TableParam tableParam = new TableParam.Builder(tableNameNew).build();
res = client.getTableRowCount(tableParam);
res = client.getTableRowCount(tableNameNew);
Assert.assertEquals(res.getTableRowCount(), nb);
}
}
......
tests/milvus_python_test/conftest.py
浏览文件 @ dc65c2b2
......@@ -12,6 +12,7 @@ index_file_size = 10
def pytest_addoption(parser):
parser.addoption("--ip", action="store", default="localhost")
parser.addoption("--port", action="store", default=19530)
parser.addoption("--internal", action="store", default=False)
def check_server_connection(request):
......@@ -76,7 +77,10 @@ def dis_connect(request):
def args(request):
ip = request.config.getoption("--ip")
port = request.config.getoption("--port")
internal = request.config.getoption("--internal")
args = {"ip": ip, "port": port}
if internal:
args = {"ip": ip, "port": port, "internal": internal}
return args
......
tests/milvus_python_test/test_delete_vectors.py
浏览文件 @ dc65c2b2
......@@ -108,8 +108,11 @@ class TestDeleteVectorsBase:
scope="function",
params=gen_index_params()
)
def get_index_params(self, request):
yield request.param
def get_index_params(self, request, args):
if "internal" in args:
if request.param["index_type"] == IndexType.IVF_SQ8H:
pytest.skip("sq8h not support in open source")
return request.param
@pytest.mark.timeout(DELETE_TIMEOUT)
def test_delete_vectors_valid_range_index_created(self, connect, table, get_index_params):
......@@ -291,8 +294,11 @@ class TestDeleteVectorsIP:
scope="function",
params=gen_index_params()
)
def get_index_params(self, request):
yield request.param
def get_index_params(self, request, args):
if "internal" in args:
if request.param["index_type"] == IndexType.IVF_SQ8H:
pytest.skip("sq8h not support in open source")
return request.param
@pytest.mark.timeout(DELETE_TIMEOUT)
def test_delete_vectors_valid_range_index_created(self, connect, ip_table, get_index_params):
......
tests/milvus_python_test/test_index.py
浏览文件 @ dc65c2b2
......@@ -26,8 +26,11 @@ class TestIndexBase:
scope="function",
params=gen_index_params()
)
def get_index_params(self, request):
yield request.param
def get_index_params(self, request, args):
if "internal" in args:
if request.param["index_type"] == IndexType.IVF_SQ8H:
pytest.skip("sq8h not support in open source")
return request.param
@pytest.fixture(
scope="function",
......@@ -501,8 +504,11 @@ class TestIndexIP:
scope="function",
params=gen_index_params()
)
def get_index_params(self, request):
yield request.param
def get_index_params(self, request, args):
if "internal" in args:
if request.param["index_type"] == IndexType.IVF_SQ8H:
pytest.skip("sq8h not support in open source")
return request.param
@pytest.fixture(
scope="function",
......
tests/milvus_python_test/test_search_vectors.py
浏览文件 @ dc65c2b2
......@@ -43,8 +43,11 @@ class TestSearchBase:
scope="function",
params=gen_index_params()
)
def get_index_params(self, request):
yield request.param
def get_index_params(self, request, args):
if "internal" in args:
if request.param["index_type"] == IndexType.IVF_SQ8H:
pytest.skip("sq8h not support in open source")
return request.param
"""
generate top-k params
......
tests/milvus_python_test/test_table_count.py
浏览文件 @ dc65c2b2
......@@ -38,8 +38,11 @@ class TestTableCount:
scope="function",
params=gen_index_params()
)
def get_index_params(self, request):
yield request.param
def get_index_params(self, request, args):
if "internal" in args:
if request.param["index_type"] == IndexType.IVF_SQ8H:
pytest.skip("sq8h not support in open source")
return request.param
def test_table_rows_count(self, connect, table, add_vectors_nb):
'''
......@@ -179,8 +182,11 @@ class TestTableCountIP:
scope="function",
params=gen_index_params()
)
def get_index_params(self, request):
yield request.param
def get_index_params(self, request, args):
if "internal" in args:
if request.param["index_type"] == IndexType.IVF_SQ8H:
pytest.skip("sq8h not support in open source")
return request.param
def test_table_rows_count(self, connect, ip_table, add_vectors_nb):
'''
......
tests/milvus_python_test/utils.py
浏览文件 @ dc65c2b2
......@@ -461,6 +461,7 @@ def gen_simple_index_params():
return gen_params(index_types, nlists)
if __name__ == "__main__":
import numpy
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或