Commit c8e2d6b7 authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #51 from del-zhenwu/0.5.0 

update java-tests and classified python-tests

Former-commit-id: 651f9c3493dd900b7ba0d69ab0c1a3d67547de5b
parents 9fb3fc1e 89686db1

tests/milvus-java-test/pom.xml

+3 −3
Original line number Diff line number Diff line
@@ -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>-->

tests/milvus-java-test/src/main/java/com/MainClass.java

+5 −6
Original line number Diff line number Diff line
@@ -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

+13 −17
Original line number Diff line number Diff line
@@ -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

+80 −86
Original line number Diff line number Diff line 
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

+33 −49

File changed.

Preview size limit exceeded, changes collapsed.