[skip ci] update default field name (#3096)

* [skip ci] update default field name
Signed-off-by: Nzw <zw@milvus.io>

* [skip ci] update field name
Signed-off-by: Nzw <zw@milvus.io>
Co-authored-by: Nzw <zw@milvus.io>

tests/milvus_python_test/entity/test_delete.py

@@ -15,7 +15,7 @@ collection_id = "test_delete"
 DELETE_TIMEOUT = 60
 tag = "1970-01-01"
 nb = 6000
-field_name = "float_vector"
+field_name = default_float_vec_field_name
 entity = gen_entities(1)
 raw_vector, binary_entity = gen_binary_entities(1)
 entities = gen_entities(nb)

tests/milvus_python_test/entity/test_get_entity_by_id.py

@@ -16,7 +16,6 @@ collection_id = "test_get"
 DELETE_TIMEOUT = 60
 tag = "1970-01-01"
 nb = 6000
-field_name = "float_entity"
 entity = gen_entities(1)
 binary_entity = gen_binary_entities(1)
 entities = gen_entities(nb)
@@ -24,7 +23,7 @@ raw_vectors, binary_entities = gen_binary_entities(nb)
 default_single_query = {
     "bool": {
         "must": [
-            {"vector": {field_name: {"topk": 10, "query": gen_vectors(1, dim), "params": {"nprobe": 10}}}}
+            {"vector": {default_float_vec_field_name: {"topk": 10, "query": gen_vectors(1, dim), "params": {"nprobe": 10}}}}
         ]
     }
 }
@@ -69,7 +68,7 @@ class TestGetBase:
         assert res_count == nb
         get_ids = [ids[get_pos]]
         res = connect.get_entity_by_id(collection, get_ids)
-        assert_equal_vector(res[0].get("vector"), entities[-1]["values"][get_pos])
+        assert_equal_vector(res[0].get(default_float_vec_field_name), entities[-1]["values"][get_pos])
 
     def test_get_entity_multi_ids(self, connect, collection, get_pos):
         '''
@@ -82,7 +81,7 @@ class TestGetBase:
         get_ids = ids[:get_pos]
         res = connect.get_entity_by_id(collection, get_ids)
         for i in range(get_pos):
-            assert_equal_vector(res[i].get("vector"), entities[-1]["values"][i])
+            assert_equal_vector(res[i].get(default_float_vec_field_name), entities[-1]["values"][i])
 
     def test_get_entity_parts_ids(self, connect, collection):
         '''
@@ -94,8 +93,8 @@ class TestGetBase:
         connect.flush([collection])
         get_ids = [ids[0], 1, ids[-1]]
         res = connect.get_entity_by_id(collection, get_ids)
-        assert_equal_vector(res[0].get("vector"), entities[-1]["values"][0])
-        assert_equal_vector(res[-1].get("vector"), entities[-1]["values"][-1])
+        assert_equal_vector(res[0].get(default_float_vec_field_name), entities[-1]["values"][0])
+        assert_equal_vector(res[-1].get(default_float_vec_field_name), entities[-1]["values"][-1])
         assert res[1] is None
 
     def test_get_entity_limit(self, connect, collection, args):
@@ -124,7 +123,7 @@ class TestGetBase:
         get_ids = [ids[0]]
         res = connect.get_entity_by_id(collection, get_ids)
         assert len(res) == 1
-        assert_equal_vector(res[0].get("vector"), entities[-1]["values"][0])
+        assert_equal_vector(res[0].get(default_float_vec_field_name), entities[-1]["values"][0])
 
     def test_get_entity_params_same_ids(self, connect, collection):
         '''
@@ -140,7 +139,7 @@ class TestGetBase:
         assert len(res) == len(get_ids)
         for i in range(len(get_ids)):
             logging.getLogger().info(i)
-            assert_equal_vector(res[i].get("vector"), entity[-1]["values"][0])
+            assert_equal_vector(res[i].get(default_float_vec_field_name), entity[-1]["values"][0])
 
     def test_get_entities_params_same_ids(self, connect, collection):
         '''
@@ -154,7 +153,7 @@ class TestGetBase:
         res = connect.get_entity_by_id(collection, get_ids)
         assert len(res) == len(get_ids)
         for i in range(len(get_ids)):
-            assert_equal_vector(res[i].get("vector"), entities[-1]["values"][0])
+            assert_equal_vector(res[i].get(default_float_vec_field_name), entities[-1]["values"][0])
 
     """
     ******************************************************************
@@ -172,8 +171,8 @@ class TestGetBase:
         connect.flush([ip_collection])
         get_ids = [ids[0], 1, ids[-1]]
         res = connect.get_entity_by_id(ip_collection, get_ids)
-        assert_equal_vector(res[0].get("vector"), entities[-1]["values"][0])
-        assert_equal_vector(res[-1].get("vector"), entities[-1]["values"][-1])
+        assert_equal_vector(res[0].get(default_float_vec_field_name), entities[-1]["values"][0])
+        assert_equal_vector(res[-1].get(default_float_vec_field_name), entities[-1]["values"][-1])
         assert res[1] is None
 
     def test_get_entity_parts_ids_jac(self, connect, jac_collection):
@@ -207,7 +206,7 @@ class TestGetBase:
         get_ids = ids[:get_pos]
         res = connect.get_entity_by_id(collection, get_ids)
         for i in range(get_pos):
-            assert_equal_vector(res[i].get("vector"), entities[-1]["values"][i])
+            assert_equal_vector(res[i].get(default_float_vec_field_name), entities[-1]["values"][i])
 
     def test_get_entities_tag_default(self, connect, collection, get_pos):
         '''
@@ -221,7 +220,7 @@ class TestGetBase:
         get_ids = ids[:get_pos]
         res = connect.get_entity_by_id(collection, get_ids)
         for i in range(get_pos):
-            assert_equal_vector(res[i].get("vector"), entities[-1]["values"][i])
+            assert_equal_vector(res[i].get(default_float_vec_field_name), entities[-1]["values"][i])
 
     def test_get_entities_tags_default(self, connect, collection, get_pos):
         '''
@@ -237,7 +236,7 @@ class TestGetBase:
         get_ids = ids[:get_pos]
         res = connect.get_entity_by_id(collection, get_ids)
         for i in range(get_pos):
-            assert_equal_vector(res[i].get("vector"), entities[-1]["values"][i])
+            assert_equal_vector(res[i].get(default_float_vec_field_name), entities[-1]["values"][i])
 
     def test_get_entities_tags_A(self, connect, collection, get_pos):
         '''
@@ -253,7 +252,7 @@ class TestGetBase:
         get_ids = ids[:get_pos]
         res = connect.get_entity_by_id(collection, get_ids)
         for i in range(get_pos):
-            assert_equal_vector(res[i].get("vector"), entities[-1]["values"][i])
+            assert_equal_vector(res[i].get(default_float_vec_field_name), entities[-1]["values"][i])
 
     def test_get_entities_tags_B(self, connect, collection, get_pos):
         '''
@@ -272,9 +271,9 @@ class TestGetBase:
         get_ids.extend(ids_new[:get_pos])
         res = connect.get_entity_by_id(collection, get_ids)
         for i in range(get_pos):
-            assert_equal_vector(res[i].get("vector"), entities[-1]["values"][i])
+            assert_equal_vector(res[i].get(default_float_vec_field_name), entities[-1]["values"][i])
         for i in range(get_pos, get_pos*2):
-            assert_equal_vector(res[i].get("vector"), new_entities[-1]["values"][i-get_pos])
+            assert_equal_vector(res[i].get(default_float_vec_field_name), new_entities[-1]["values"][i-get_pos])
 
     def test_get_entities_indexed_tag(self, connect, collection, get_simple_index, get_pos):
         '''
@@ -285,11 +284,11 @@ class TestGetBase:
         connect.create_partition(collection, tag)
         ids = connect.insert(collection, entities, partition_tag=tag)
         connect.flush([collection])
-        connect.create_index(collection, field_name, get_simple_index)
+        connect.create_index(collection, default_float_vec_field_name, get_simple_index)
         get_ids = ids[:get_pos]
         res = connect.get_entity_by_id(collection, get_ids)
         for i in range(get_pos):
-            assert_equal_vector(res[i].get("vector"), entities[-1]["values"][i])
+            assert_equal_vector(res[i].get(default_float_vec_field_name), entities[-1]["values"][i])
 
     """
     ******************************************************************
@@ -320,7 +319,7 @@ class TestGetBase:
         ids = connect.insert(collection, entities)
         connect.flush([collection])
         get_ids = [ids[get_pos]]
-        fields = ["int64", "float", "vector"]
+        fields = ["int64", "float", default_float_vec_field_name]
         res = connect.get_entity_by_id(collection, get_ids, fields = fields)
         # assert fields
 
@@ -437,11 +436,11 @@ class TestGetBase:
         '''
         ids = connect.insert(collection, entities)
         connect.flush([collection])
-        connect.create_index(collection, field_name, get_simple_index)
+        connect.create_index(collection, default_float_vec_field_name, get_simple_index)
         get_ids = ids[:get_pos]
         res = connect.get_entity_by_id(collection, get_ids)
         for i in range(get_pos):
-            assert_equal_vector(res[i].get("vector"), entities[-1]["values"][i])
+            assert_equal_vector(res[i].get(default_float_vec_field_name), entities[-1]["values"][i])
 
     def test_get_entities_indexed_single(self, connect, collection, get_simple_index, get_pos):
         '''
@@ -453,11 +452,11 @@ class TestGetBase:
         for i in range(nb):
             ids.append(connect.insert(collection, entity)[0])
         connect.flush([collection])
-        connect.create_index(collection, field_name, get_simple_index)
+        connect.create_index(collection, default_float_vec_field_name, get_simple_index)
         get_ids = ids[:get_pos]
         res = connect.get_entity_by_id(collection, get_ids)
         for i in range(get_pos):
-            assert_equal_vector(res[i].get("vector"), entity[-1]["values"][0])
+            assert_equal_vector(res[i].get(default_float_vec_field_name), entity[-1]["values"][0])
 
     def test_get_entities_after_delete_disable_autoflush(self, connect, collection, get_pos):
         '''
@@ -474,7 +473,7 @@ class TestGetBase:
             get_ids = ids[:get_pos]
             res = connect.get_entity_by_id(collection, get_ids)
             for i in range(get_pos):
-                assert_equal_vector(res[i].get("vector"), entities[-1]["values"][i])
+                assert_equal_vector(res[i].get(default_float_vec_field_name), entities[-1]["values"][i])
         finally:
             enable_flush(connect)
 
@@ -517,7 +516,7 @@ class TestGetBase:
             res = connect.get_entity_by_id(collection, get_id)
             assert len(res) == len(get_id)
             for i in range(len(res)):
-                assert_equal_vector(res[i].get("vector"), entities[-1]["values"][100+i])
+                assert_equal_vector(res[i].get(default_float_vec_field_name), entities[-1]["values"][100+i])
         with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
             future_results = {executor.submit(
                 get): i for i in range(10)}

tests/milvus_python_test/entity/test_insert.py

@@ -15,7 +15,7 @@ ADD_TIMEOUT = 60
 tag = "1970-01-01"
 insert_interval_time = 1.5
 nb = 6000
-field_name = "float_vector"
+field_name = default_float_vec_field_name 
 entity = gen_entities(1)
 raw_vector, binary_entity = gen_binary_entities(1)
 entities = gen_entities(nb)

tests/milvus_python_test/entity/test_list_id_in_segment.py

@@ -11,7 +11,7 @@ dim = 128
 segment_row_count = 100000
 nb = 6000
 tag = "1970-01-01"
-field_name = "float_vector"
+field_name = default_float_vec_field_name
 collection_id = "list_id_in_segment"
 entity = gen_entities(1)
 raw_vector, binary_entity = gen_binary_entities(1)

tests/milvus_python_test/entity/test_search.py

@@ -20,7 +20,7 @@ nb = 6000
 top_k = 10
 nprobe = 1
 epsilon = 0.001
-field_name = "float_vector"
+field_name = default_float_vec_field_name
 default_fields = gen_default_fields() 
 search_param = {"nprobe": 1}
 entity = gen_entities(1, is_normal=True)

tests/milvus_python_test/test_compact.py

@@ -19,7 +19,7 @@ entities = gen_entities(nb)
 raw_vector, binary_entity = gen_binary_entities(1)
 raw_vectors, binary_entities = gen_binary_entities(nb)
 default_fields = gen_default_fields()
-field_name = "float_vector"
+field_name = default_float_vec_field_name
 default_single_query = {
     "bool": {
         "must": [

tests/milvus_python_test/utils.py

@@ -17,6 +17,8 @@ default_flush_interval = 1
 big_flush_interval = 1000
 dimension = 128
 segment_row_count = 5000
+default_float_vec_field_name = "float_vector"
+default_binary_vec_field_name = "binary_vector"
 
 # TODO:
 all_index_types = [
@@ -210,7 +212,7 @@ def gen_default_fields():
         "fields": [
             {"field": "int64", "type": DataType.INT64},
             {"field": "float", "type": DataType.FLOAT},
-            {"field": "float_vector", "type": DataType.FLOAT_VECTOR, "params": {"dim": dimension}}
+            {"field": default_float_vec_field_name, "type": DataType.FLOAT_VECTOR, "params": {"dim": dimension}}
         ],
         "segment_row_count": segment_row_count
     }
@@ -222,7 +224,7 @@ def gen_entities(nb, is_normal=False):
     entities = [
         {"field": "int64", "type": DataType.INT64, "values": [2 for i in range(nb)]},
         {"field": "float", "type": DataType.FLOAT, "values": [3.0 for i in range(nb)]},
-        {"field": "float_vector", "type": DataType.FLOAT_VECTOR, "values": vectors}
+        {"field": default_float_vec_field_name, "type": DataType.FLOAT_VECTOR, "values": vectors}
     ]
     return entities
 
@@ -232,7 +234,7 @@ def gen_binary_entities(nb):
     entities = [
         {"field": "int64", "type": DataType.INT64, "values": [2 for i in range(nb)]},
         {"field": "float", "type": DataType.FLOAT, "values": [3.0 for i in range(nb)]},
-        {"field": "binary_vector", "type": DataType.BINARY_VECTOR, "values": vectors}
+        {"field": default_binary_vec_field_name, "type": DataType.BINARY_VECTOR, "values": vectors}
     ]
     return raw_vectors, entities