admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-06 17:18:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enable delete cases (#11642)

Browse Source 
Signed-off-by: ThreadDao <yufen.zong@zilliz.com>
This commit is contained in:
ThreadDao 2021-11-12 20:37:08 +08:00 committed by GitHub
parent 7bf00a263c
commit b3a3f4fdcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
tests/python_client/testcases/test_delete.py
View File

@ -14,7 +14,6 @@ query_res_tmp_expr = [{f'{ct.default_int64_field_name}': 0}]
exp_res = "exp_res" exp_res = "exp_res"
@pytest.mark.xfail(reason="Delete API disabled")
class TestDeleteParams(TestcaseBase): class TestDeleteParams(TestcaseBase):
""" """
Test case of delete interface Test case of delete interface
@ -252,7 +251,6 @@ class TestDeleteParams(TestcaseBase):
collection_w.delete(tmp_expr, partition_name=partition_name, check_task=CheckTasks.err_res, check_items=error) collection_w.delete(tmp_expr, partition_name=partition_name, check_task=CheckTasks.err_res, check_items=error)
@pytest.mark.xfail(reason="Delete API disabled")
class TestDeleteOperation(TestcaseBase): class TestDeleteOperation(TestcaseBase):
""" """
****************************************************************** ******************************************************************
@ -288,26 +286,38 @@ class TestDeleteOperation(TestcaseBase):
collection_w.query(tmp_expr, check_task=CheckTasks.check_query_empty) collection_w.query(tmp_expr, check_task=CheckTasks.check_query_empty)
collection_w.delete(expr=tmp_expr) collection_w.delete(expr=tmp_expr)
@pytest.mark.xfail(reason="Issue #11641")
@pytest.mark.tags(CaseLabel.L1) @pytest.mark.tags(CaseLabel.L1)
def test_delete_after_index(self): def test_delete_after_index(self):
""" """
target: test delete after creating index target: test delete after creating index
method: 1.create index 2.delete entities method: 1.insert, flush, load
expected: assert index and num entities 2.create index and re-load
3.delete entities
4.search
expected: assert index and deleted id not in search result
""" """
# init collection with nb default data # create collection, insert tmp_nb, flush and load
collection_w = self.init_collection_general(prefix, nb=tmp_nb, insert_data=True)[0] collection_w, vectors = self.init_collection_general(prefix, insert_data=True)[0:2]
# create index # create index
index_params = {"index_type": "IVF_SQ8", "metric_type": "L2", "params": {"nlist": 64}} index_params = {"index_type": "IVF_SQ8", "metric_type": "L2", "params": {"nlist": 64}}
collection_w.create_index(ct.default_float_vec_field_name, index_params) collection_w.create_index(ct.default_float_vec_field_name, index_params)
assert collection_w.has_index()[0] assert collection_w.has_index()[0]
collection_w.release()
collection_w.load()
# delete entity # delete entity
res, _ = collection_w.delete(tmp_expr) collection_w.delete(tmp_expr)
assert res.delete_count == 1
collection_w.query(tmp_expr, check_task=CheckTasks.check_query_empty) collection_w.query(tmp_expr, check_task=CheckTasks.check_query_empty)
assert collection_w.has_index()[0] assert collection_w.has_index()[0]
# search with id 0 vectors
search_res, _ = collection_w.search([vectors[0][ct.default_float_vec_field_name][0]],
ct.default_float_vec_field_name,
ct.default_search_params, ct.default_limit)
assert 0 not in search_res[0].ids
@pytest.mark.xfail(reason="Issue #11641")
@pytest.mark.tags(CaseLabel.L1) @pytest.mark.tags(CaseLabel.L1)
def test_delete_and_index(self): def test_delete_and_index(self):
""" """
@ -337,6 +347,7 @@ class TestDeleteOperation(TestcaseBase):
search_res, _ = collection_w.search([df[ct.default_float_vec_field_name][0]], search_res, _ = collection_w.search([df[ct.default_float_vec_field_name][0]],
ct.default_float_vec_field_name, ct.default_float_vec_field_name,
ct.default_search_params, ct.default_limit) ct.default_search_params, ct.default_limit)
log.debug(search_res[0].ids)
# assert search results not contains deleted ids # assert search results not contains deleted ids
inter = set(insert_res.primary_keys[:ct.default_nb // 2]).intersection(set(search_res[0].ids)) inter = set(insert_res.primary_keys[:ct.default_nb // 2]).intersection(set(search_res[0].ids))
log.debug(inter) log.debug(inter)
@ -384,22 +395,23 @@ class TestDeleteOperation(TestcaseBase):
expected: deleted entity is not in the search result expected: deleted entity is not in the search result
""" """
# init collection with nb default data # init collection with nb default data
collection_w = self.init_collection_general(prefix, insert_data=True)[0] collection_w, _, _, ids = self.init_collection_general(prefix, insert_data=True)[0:4]
entity, _ = collection_w.query(tmp_expr, output_fields=["%"]) entity, _ = collection_w.query(tmp_expr, output_fields=["%"])
default_search_exp = "int64 == 0"
search_res, _ = collection_w.search([entity[0][ct.default_float_vec_field_name]], search_res, _ = collection_w.search([entity[0][ct.default_float_vec_field_name]],
ct.default_float_vec_field_name, ct.default_float_vec_field_name,
ct.default_search_params, ct.default_limit, default_search_exp) ct.default_search_params, ct.default_limit)
# assert search results contains entity # assert search results contains entity
assert 0 in search_res[0].ids assert 0 in search_res[0].ids
del_res, _ = collection_w.delete(tmp_expr) expr = f'{ct.default_int64_field_name} in {ids[:ct.default_nb // 2]}'
assert del_res.delete_count == 1 collection_w.delete(expr)
search_res_2, _ = collection_w.search([entity[0][ct.default_float_vec_field_name]], search_res_2, _ = collection_w.search([entity[0][ct.default_float_vec_field_name]],
ct.default_float_vec_field_name, ct.default_float_vec_field_name,
ct.default_search_params, ct.default_limit, default_search_exp) ct.default_search_params, ct.default_limit)
# assert search result is not equal to entity # assert search result is not equal to entity
assert len(search_res_2) == 0 log.debug(f"Second search result ids: {search_res_2[0].ids}")
inter = set(ids[:ct.default_nb // 2]).intersection(set(search_res_2[0].ids))
assert len(inter) == 0
@pytest.mark.tags(CaseLabel.L1) @pytest.mark.tags(CaseLabel.L1)
def test_delete_expr_repeated_values(self): def test_delete_expr_repeated_values(self):
@ -417,14 +429,14 @@ class TestDeleteOperation(TestcaseBase):
collection_w.num_entities collection_w.num_entities
collection_w.query(expr, check_task=CheckTasks.check_query_empty) collection_w.query(expr, check_task=CheckTasks.check_query_empty)
# @pytest.mark.xfail(reason="Issues #10670")
@pytest.mark.tags(CaseLabel.L1) @pytest.mark.tags(CaseLabel.L1)
def test_delete_duplicate_primary_keys(self): def test_delete_duplicate_primary_keys(self):
""" """
target: test delete from duplicate primary keys target: test delete from duplicate primary keys
method: 1.insert data with dup ids method: 1.insert data with dup ids
2.delete with repeated or not values 2.delete with repeated or not values
expected: delete all entities, currently only delete one entity expected: currently only delete one entity, query get one entity
todo delete all entities
""" """
collection_w = self.init_collection_wrap(name=cf.gen_unique_str(prefix)) collection_w = self.init_collection_wrap(name=cf.gen_unique_str(prefix))
df = cf.gen_default_dataframe_data(nb=tmp_nb) df = cf.gen_default_dataframe_data(nb=tmp_nb)
@ -433,10 +445,15 @@ class TestDeleteOperation(TestcaseBase):
assert collection_w.num_entities == tmp_nb assert collection_w.num_entities == tmp_nb
del_res, _ = collection_w.delete(tmp_expr) del_res, _ = collection_w.delete(tmp_expr)
collection_w.load() collection_w.load()
# todo assert del_res.delete_count == tmp_nb
# collection_w.query(tmp_expr, check_task=CheckTasks.check_query_empty) # Just one query res and search res, because de-dup
res, _ = collection_w.query(tmp_expr) res, _ = collection_w.query(tmp_expr, output_fields=["*"])
assert len(res) == tmp_nb - 1 assert res[0][ct.default_float_field_name] != 0.0
search_res, _ = collection_w.search([df[ct.default_float_vec_field_name][0]],
ct.default_float_vec_field_name,
ct.default_search_params, ct.default_limit, output_fields=[ct.default_int64_field_name, ct.default_float_field_name])
assert search_res[0][0].entity._row_data[ct.default_float_field_name] != 0.0
@pytest.mark.tags(CaseLabel.L2) @pytest.mark.tags(CaseLabel.L2)
def test_delete_empty_partition(self): def test_delete_empty_partition(self):

2
tests/python_client/utils/util_log.py
View File

@ -43,7 +43,7 @@ class TestLog:
ch = logging.StreamHandler(sys.stdout) ch = logging.StreamHandler(sys.stdout)
ch.setLevel(logging.DEBUG) ch.setLevel(logging.DEBUG)
ch.setFormatter(formatter) ch.setFormatter(formatter)
self.log.addHandler(ch) # self.log.addHandler(ch)
except Exception as e: except Exception as e:
print("Can not use %s or %s or %s to log. error : %s" % (log_debug, log_file, log_err, str(e))) print("Can not use %s or %s or %s to log. error : %s" % (log_debug, log_file, log_err, str(e)))