Unverified Commit fae67ee4 authored by del-zhenwu's avatar del-zhenwu Committed by GitHub
Browse files

Rename methods (#2312) 



* rename interfaces in cases

Signed-off-by: default avatarzw <zw@zilliz.com>

* rename search_by_id

Signed-off-by: default avatarzw <zw@zilliz.com>

* remove test search_by_id

Signed-off-by: default avatarzw <zw@zilliz.com>

* [skip ci] Update CHANGELOG

Signed-off-by: default avatarJinHai-CN <hai.jin@zilliz.com>

* rename methods

Signed-off-by: default avatarzw <zw@zilliz.com>

* rename methods

Signed-off-by: default avatarzw <zw@milvus.io>

* fix rename issue

Signed-off-by: default avatarzw <zw@zilliz.com>

* update hnsw default index param

Signed-off-by: default avatarzw <zw@zilliz.com>

* Update CHANGELOG.md

Co-authored-by: default avatarJinHai-CN <hai.jin@zilliz.com>
Co-authored-by: default avatarzw <zw@milvus.io>
parent ff4c1a07

tests/milvus-java-test/MilvusSDkJavaTest.iml

+4 −0
Original line number Diff line number Diff line
@@ -60,5 +60,9 @@ 
    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />

    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />

    <orderEntry type="library" name="Maven: org.json:json:20190722" level="project" />

    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />

    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.12.1" level="project" />

    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.12.1" level="project" />

    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.logging.log4j:log4j-core:2.12.1" level="project" />

  </component>

</module>
 
 No newline at end of file

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

+3 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public class MainClass { 
                    .withPort(port)

                    .build();

            client.connect(connectParam);

//            List<String> tableNames = client.showCollections().getCollectionNames();

//            List<String> tableNames = client.listCollections().getCollectionNames();

//            for (int j = 0; j < tableNames.size(); ++j

//                 ) {

//                client.dropCollection(tableNames.get(j));
@@ -108,7 +108,7 @@ public class MainClass { 
                    .withPort(port)

                    .build();

            client.connect(connectParam);

//            List<String> tableNames = client.showCollections().getCollectionNames();

//            List<String> tableNames = client.listCollections().getCollectionNames();

//            for (int j = 0; j < tableNames.size(); ++j

//            ) {

//                client.dropCollection(tableNames.get(j));
@@ -170,7 +170,7 @@ public class MainClass { 
        classes.add(new XmlClass("com.TestPartition"));

        classes.add(new XmlClass("com.TestGetVectorByID"));

        classes.add(new XmlClass("com.TestCollectionInfo"));

        classes.add(new XmlClass("com.TestSearchByIds"));

//        classes.add(new XmlClass("com.TestSearchByIds"));



        test.setXmlClasses(classes) ;

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

+6 −6
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public class TestAddVectors { 
        Response res_flush = client.flush(collectionName);

        assert(res_flush.ok());

        // Assert collection row count

        Assert.assertEquals(client.getCollectionRowCount(collectionName).getCollectionRowCount(), nb);

        Assert.assertEquals(client.countEntities(collectionName).getCollectionEntityCount(), nb);

    }



    @Test(dataProvider = "Collection", dataProviderClass = MainClass.class)
@@ -56,7 +56,7 @@ public class TestAddVectors { 
        Response res_flush = client.flush(collectionName);

        assert(res_flush.ok());

        // Assert collection row count

        Assert.assertEquals(client.getCollectionRowCount(collectionName).getCollectionRowCount(), nb);

        Assert.assertEquals(client.countEntities(collectionName).getCollectionEntityCount(), nb);

    }



    @Test(dataProvider = "Collection", dataProviderClass = MainClass.class)
@@ -99,7 +99,7 @@ public class TestAddVectors { 
        Response res_flush = client.flush(collectionName);

        assert(res_flush.ok());

        // Assert collection row count

        Assert.assertEquals(client.getCollectionRowCount(collectionName).getCollectionRowCount(), nb);

        Assert.assertEquals(client.countEntities(collectionName).getCollectionEntityCount(), nb);

    }



    // Add vectors into collection, which tag not existed
@@ -123,7 +123,7 @@ public class TestAddVectors { 
        Response res_flush = client.flush(collectionName);

        assert(res_flush.ok());

        // Assert collection row count

        Assert.assertEquals(client.getCollectionRowCount(collectionName).getCollectionRowCount(), nb);

        Assert.assertEquals(client.countEntities(collectionName).getCollectionEntityCount(), nb);

    }



    @Test(dataProvider = "BinaryCollection", dataProviderClass = MainClass.class)
@@ -135,7 +135,7 @@ public class TestAddVectors { 
        Response res_flush = client.flush(collectionName);

        assert(res_flush.ok());

        // Assert collection row count

        Assert.assertEquals(client.getCollectionRowCount(collectionName).getCollectionRowCount(), nb);

        Assert.assertEquals(client.countEntities(collectionName).getCollectionEntityCount(), nb);

    }



    @Test(dataProvider = "BinaryCollection", dataProviderClass = MainClass.class)
@@ -151,7 +151,7 @@ public class TestAddVectors { 
        Response res_flush = client.flush(collectionName);

        assert(res_flush.ok());

        // Assert collection row count

        Assert.assertEquals(client.getCollectionRowCount(collectionName).getCollectionRowCount(), nb);

        Assert.assertEquals(client.countEntities(collectionName).getCollectionEntityCount(), nb);

    }



    @Test(dataProvider = "BinaryCollection", dataProviderClass = MainClass.class)

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

+7 −7
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class TestCollection { 
    @Test(dataProvider = "ConnectInstance", dataProviderClass = MainClass.class)

    public void test_show_tables(MilvusClient client, String collectionName){

        Integer tableNum = 10;

        ShowCollectionsResponse res = null;

        ListCollectionsResponse res = null;

        for (int i = 0; i < tableNum; ++i) {

            String collectionNameNew = collectionName+"_"+Integer.toString(i);

            CollectionMapping tableSchema = new CollectionMapping.Builder(collectionNameNew, dimension)
@@ -67,14 +67,14 @@ public class TestCollection { 
                    .withMetricType(MetricType.L2)

                    .build();

            client.createCollection(tableSchema);

            List<String> collectionNames = client.showCollections().getCollectionNames();

            List<String> collectionNames = client.listCollections().getCollectionNames();

            Assert.assertTrue(collectionNames.contains(collectionNameNew));

        }

    }



    @Test(dataProvider = "DisConnectInstance", dataProviderClass = MainClass.class)

    public void test_show_tables_without_connect(MilvusClient client, String collectionName){

        ShowCollectionsResponse res = client.showCollections();

        ListCollectionsResponse res = client.listCollections();

        assert(!res.getResponse().ok());

    }
@@ -83,7 +83,7 @@ public class TestCollection { 
        Response res = client.dropCollection(collectionName);

        assert(res.ok());

        Thread.currentThread().sleep(1000);

        List<String> collectionNames = client.showCollections().getCollectionNames();

        List<String> collectionNames = client.listCollections().getCollectionNames();

        Assert.assertFalse(collectionNames.contains(collectionName));

    }
@@ -91,7 +91,7 @@ public class TestCollection { 
    public void test_drop_table_not_existed(MilvusClient client, String collectionName) {

        Response res = client.dropCollection(collectionName+"_");

        assert(!res.ok());

        List<String> collectionNames = client.showCollections().getCollectionNames();

        List<String> collectionNames = client.listCollections().getCollectionNames();

        Assert.assertTrue(collectionNames.contains(collectionName));

    }
@@ -103,7 +103,7 @@ public class TestCollection { 


    @Test(dataProvider = "Collection", dataProviderClass = MainClass.class)

    public void test_describe_table(MilvusClient client, String collectionName) {

        DescribeCollectionResponse res = client.describeCollection(collectionName);

        GetCollectionInfoResponse res = client.getCollectionInfo(collectionName);

        assert(res.getResponse().ok());

        CollectionMapping tableSchema = res.getCollectionMapping().get();

        Assert.assertEquals(tableSchema.getDimension(), dimension);
@@ -114,7 +114,7 @@ public class TestCollection { 


    @Test(dataProvider = "DisConnectInstance", dataProviderClass = MainClass.class)

    public void test_describe_table_without_connect(MilvusClient client, String collectionName) {

        DescribeCollectionResponse res = client.describeCollection(collectionName);

        GetCollectionInfoResponse res = client.getCollectionInfo(collectionName);

        assert(!res.getResponse().ok());

    }

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

+8 −8
Original line number Diff line number Diff line
@@ -16,18 +16,18 @@ public class TestCollectionCount { 


    @Test(dataProvider = "Collection", dataProviderClass = MainClass.class)

    public void test_collection_count_no_vectors(MilvusClient client, String collectionName) {

        Assert.assertEquals(client.getCollectionRowCount(collectionName).getCollectionRowCount(), 0);

        Assert.assertEquals(client.countEntities(collectionName).getCollectionEntityCount(), 0);

    }



    @Test(dataProvider = "Collection", dataProviderClass = MainClass.class)

    public void test_collection_count_collection_not_existed(MilvusClient client, String collectionName) {

        GetCollectionRowCountResponse res = client.getCollectionRowCount(collectionName+"_");

        CountEntitiesResponse res = client.countEntities(collectionName+"_");

        assert(!res.getResponse().ok());

    }



    @Test(dataProvider = "DisConnectInstance", dataProviderClass = MainClass.class)

    public void test_collection_count_without_connect(MilvusClient client, String collectionName) {

        GetCollectionRowCountResponse res = client.getCollectionRowCount(collectionName+"_");

        CountEntitiesResponse res = client.countEntities(collectionName+"_");

        assert(!res.getResponse().ok());

    }
@@ -37,7 +37,7 @@ public class TestCollectionCount { 
        InsertParam insertParam = new InsertParam.Builder(collectionName).withFloatVectors(vectors).build();

        client.insert(insertParam);

        client.flush(collectionName);

        Assert.assertEquals(client.getCollectionRowCount(collectionName).getCollectionRowCount(), nb);

        Assert.assertEquals(client.countEntities(collectionName).getCollectionEntityCount(), nb);

    }



    @Test(dataProvider = "BinaryCollection", dataProviderClass = MainClass.class)
@@ -46,13 +46,13 @@ public class TestCollectionCount { 
        InsertParam insertParam = new InsertParam.Builder(collectionName).withBinaryVectors(vectorsBinary).build();

        client.insert(insertParam);

        client.flush(collectionName);

        Assert.assertEquals(client.getCollectionRowCount(collectionName).getCollectionRowCount(), nb);

        Assert.assertEquals(client.countEntities(collectionName).getCollectionEntityCount(), nb);

    }



    @Test(dataProvider = "Collection", dataProviderClass = MainClass.class)

    public void test_collection_count_multi_collections(MilvusClient client, String collectionName) throws InterruptedException {

        Integer collectionNum = 10;

        GetCollectionRowCountResponse res;

        CountEntitiesResponse res;

        for (int i = 0; i < collectionNum; ++i) {

            String collectionNameNew = collectionName + "_" + i;

            CollectionMapping collectionSchema = new CollectionMapping.Builder(collectionNameNew, dimension)
@@ -67,8 +67,8 @@ public class TestCollectionCount { 
        }

        for (int i = 0; i < collectionNum; ++i) {

            String collectionNameNew = collectionName + "_" + i;

            res = client.getCollectionRowCount(collectionNameNew);

            Assert.assertEquals(res.getCollectionRowCount(), nb);

            res = client.countEntities(collectionNameNew);

            Assert.assertEquals(res.getCollectionEntityCount(), nb);

        }

    }