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