diff --git a/tests/python_client/common/common_func.py b/tests/python_client/common/common_func.py index 314fb3e8c4..c4cf50d7a6 100644 --- a/tests/python_client/common/common_func.py +++ b/tests/python_client/common/common_func.py @@ -276,8 +276,7 @@ def gen_default_dataframe_data(nb=ct.default_nb, dim=ct.default_dim, start=0, wi int_values = pd.Series(data=[i for i in range(start, start + nb)]) float_values = pd.Series(data=[np.float32(i) for i in range(start, start + nb)], dtype="float32") string_values = pd.Series(data=[str(i) for i in range(start, start + nb)], dtype="string") - json_values = [{"number": i, "float": i*1.0, "string": str(i), "bool": bool(i), - "list": [j for j in range(i, i + ct.default_json_list_length)]} for i in range(start, start + nb)] + json_values = [{"number": i, "float": i*1.0} for i in range(start, start + nb)] float_vec_values = gen_vectors(nb, dim) df = pd.DataFrame({ ct.default_int64_field_name: int_values, @@ -298,8 +297,7 @@ def gen_default_rows_data(nb=ct.default_nb, dim=ct.default_dim, start=0, with_js dict = {ct.default_int64_field_name: i, ct.default_float_field_name: i*1.0, ct.default_string_field_name: str(i), - ct.default_json_field_name: {"number": i, "string": str(i), "bool": bool(i), - "list": [j for j in range(0, i)]}, + ct.default_json_field_name: {"number": i}, ct.default_float_vec_field_name: gen_vectors(1, dim)[0] } if with_json is False: @@ -313,8 +311,7 @@ def gen_default_data_for_upsert(nb=ct.default_nb, dim=ct.default_dim, start=0, s int_values = pd.Series(data=[i for i in range(start, start + nb)]) float_values = pd.Series(data=[np.float32(i + size) for i in range(start, start + nb)], dtype="float32") string_values = pd.Series(data=[str(i + size) for i in range(start, start + nb)], dtype="string") - json_values = [{"number": i, "string": str(i), "bool": bool(i), - "list": [j for j in range(i, i + ct.default_json_list_length)]} for i in range(start, start + nb)] + json_values = [{"number": i, "string": str(i)} for i in range(start, start + nb)] float_vec_values = gen_vectors(nb, dim) df = pd.DataFrame({ ct.default_int64_field_name: int_values, @@ -384,8 +381,8 @@ def gen_dataframe_all_data_type(nb=ct.default_nb, dim=ct.default_dim, start=0, w float_values = pd.Series(data=[np.float32(i) for i in range(start, start + nb)], dtype="float32") double_values = pd.Series(data=[np.double(i) for i in range(start, start + nb)], dtype="double") string_values = pd.Series(data=[str(i) for i in range(start, start + nb)], dtype="string") - json_values = [{"number": i, "string": str(i), "bool": bool(i), "list": [j for j in range(0, i)]} - for i in range(start, start + nb)] + json_values = [{"number": i, "string": str(i), "bool": bool(i), + "list": [j for j in range(i, i + ct.default_json_list_length)]} for i in range(start, start + nb)] float_vec_values = gen_vectors(nb, dim) df = pd.DataFrame({ ct.default_int64_field_name: int64_values, @@ -410,15 +407,11 @@ def gen_default_rows_data_all_data_type(nb=ct.default_nb, dim=ct.default_dim, st array = [] for i in range(start, start + nb): dict = {ct.default_int64_field_name: i, - ct.default_int32_field_name: i, - ct.default_int16_field_name: i, - ct.default_int8_field_name: i, ct.default_bool_field_name: bool(i), ct.default_float_field_name: i*1.0, - ct.default_double_field_name: i*1.0, ct.default_string_field_name: str(i), ct.default_json_field_name: {"number": i, "string": str(i), "bool": bool(i), - "list": [j for j in range(0, i)]}, + "list": [j for j in range(i, i + ct.default_json_list_length)]}, ct.default_float_vec_field_name: gen_vectors(1, dim)[0] } if with_json is False: diff --git a/tests/python_client/common/common_type.py b/tests/python_client/common/common_type.py index 0ae372fb60..fe2976b33d 100644 --- a/tests/python_client/common/common_type.py +++ b/tests/python_client/common/common_type.py @@ -43,7 +43,7 @@ default_resource_group_capacity = 1000000 default_tag = "1970_01_01" row_count = "row_count" default_length = 65535 -default_json_list_length = 3 +default_json_list_length = 1 default_desc = "" default_collection_desc = "default collection" default_index_name = "default_index_name" diff --git a/tests/python_client/testcases/test_search.py b/tests/python_client/testcases/test_search.py index b3eadc29f3..19e64da0af 100644 --- a/tests/python_client/testcases/test_search.py +++ b/tests/python_client/testcases/test_search.py @@ -245,7 +245,7 @@ class TestCollectionSearchInvalid(TestcaseBase): expected: raise exception and report the error """ # 1. initialize with data - collection_w = self.init_collection_general(prefix, True)[0] + collection_w = self.init_collection_general(prefix, True, 1)[0] # 2. search with invalid dim log.info("test_search_param_invalid_dim: searching with invalid dim") wrong_dim = 129 @@ -304,7 +304,7 @@ class TestCollectionSearchInvalid(TestcaseBase): expected: raise exception and report the error """ # 1. initialize with data - collection_w = self.init_collection_general(prefix, True, 10)[0] + collection_w = self.init_collection_general(prefix)[0] # 2. search with invalid metric_type log.info("test_search_param_invalid_metric_type: searching with invalid metric_type") invalid_metric = get_invalid_metric_type @@ -315,7 +315,7 @@ class TestCollectionSearchInvalid(TestcaseBase): check_items={"err_code": 1, "err_msg": "metric type not found"}) - @pytest.mark.tags(CaseLabel.L1) + @pytest.mark.tags(CaseLabel.L2) @pytest.mark.parametrize("index, params", zip(ct.all_index_types[:6], ct.default_index_params[:6])) @@ -442,7 +442,7 @@ class TestCollectionSearchInvalid(TestcaseBase): expected: raise exception and report the error """ # 1. create a collection - nb = 1000 + nb = 1 dim = 1 fields = [cf.gen_int64_field("int64_1"), cf.gen_int64_field("int64_2"), cf.gen_float_vec_field(dim=dim)] @@ -496,7 +496,7 @@ class TestCollectionSearchInvalid(TestcaseBase): expected: raise exception and report the error """ # 1. initialize with data - collection_w = self.init_collection_general(prefix, True, is_all_data_type=True)[0] + collection_w = self.init_collection_general(prefix, is_all_data_type=True)[0] # 2 search with invalid bool expr invalid_search_expr_bool = f"{default_bool_field_name} == {get_invalid_expr_bool_value}" log.info("test_search_param_invalid_expr_bool: searching with " @@ -515,18 +515,14 @@ class TestCollectionSearchInvalid(TestcaseBase): method: test search int64 and float with like expected: searched failed """ - nb = 1000 - dim = 8 - collection_w, _vectors, _, insert_ids = self.init_collection_general(prefix, True, - nb, dim=dim, - is_index=False)[0:4] + collection_w = self.init_collection_general(prefix, is_index=False)[0] index_param = {"index_type": "IVF_FLAT", "metric_type": "L2", "params": {"nlist": 100}} collection_w.create_index("float_vector", index_param) collection_w.load() log.info("test_search_with_expression: searching with expression: %s" % expression) - vectors = [[random.random() for _ in range(dim)] for _ in range(default_nq)] + vectors = [[random.random() for _ in range(default_dim)] for _ in range(default_nq)] search_res, _ = collection_w.search(vectors[:default_nq], default_search_field, - default_search_params, nb, expression, + default_search_params, default_limit, expression, check_task=CheckTasks.err_res, check_items={"err_code": 1, "err_msg": "failed to create query plan: cannot parse " @@ -580,7 +576,7 @@ class TestCollectionSearchInvalid(TestcaseBase): expected: raise exception and report the error """ # 1. initialize without data - collection_w = self.init_collection_general(prefix, True, 10)[0] + collection_w = self.init_collection_general(prefix)[0] # 2. release collection collection_w.release() # 3. Search the released collection @@ -765,7 +761,7 @@ class TestCollectionSearchInvalid(TestcaseBase): expected: raise exception and report the error """ # 1. initialize with data - collection_w = self.init_collection_general(prefix, True, is_index=False)[0] + collection_w = self.init_collection_general(prefix, is_index=False)[0] # 2. create index default_index = {"index_type": "IVF_FLAT", "params": {"nlist": 128}, "metric_type": "L2"} collection_w.create_index("float_vector", default_index) @@ -825,7 +821,7 @@ class TestCollectionSearchInvalid(TestcaseBase): expected: raise exception """ # 1. initialize with data - collection_w, _, _, insert_ids = self.init_collection_general(prefix, True)[0:4] + collection_w = self.init_collection_general(prefix)[0] # 2. search log.info("test_search_with_output_fields_not_exist: Searching collection %s" % collection_w.name) collection_w.search(vectors[:default_nq], default_search_field, @@ -888,7 +884,7 @@ class TestCollectionSearchInvalid(TestcaseBase): expected: raise exception and report the error """ # 1. initialize with data - collection_w = self.init_collection_general(prefix, True)[0] + collection_w = self.init_collection_general(prefix)[0] # 2. search log.info("test_search_output_field_invalid_wildcard: Searching collection %s" % collection_w.name) collection_w.search(vectors[:default_nq], default_search_field, @@ -911,7 +907,7 @@ class TestCollectionSearchInvalid(TestcaseBase): if ignore_growing is None or ignore_growing == "": pytest.skip("number is valid") # 1. create a collection - collection_w = self.init_collection_general(prefix, True)[0] + collection_w = self.init_collection_general(prefix, True, 10)[0] # 2. insert data again data = cf.gen_default_dataframe_data(start=10000) @@ -934,7 +930,7 @@ class TestCollectionSearchInvalid(TestcaseBase): expected: raise exception and report the error """ # 1. initialize with data - collection_w = self.init_collection_general(prefix, True, 10)[0] + collection_w = self.init_collection_general(prefix)[0] # 2. search with invalid travel timestamp log.info("test_search_param_invalid_travel_timestamp: searching with invalid travel timestamp") invalid_travel_time = get_invalid_travel_timestamp @@ -953,7 +949,7 @@ class TestCollectionSearchInvalid(TestcaseBase): expected: raise exception and report the error """ # 1. initialize with data - collection_w = self.init_collection_general(prefix, True, 10)[0] + collection_w = self.init_collection_general(prefix)[0] # 2. search with invalid travel timestamp log.info("test_search_param_invalid_guarantee_timestamp: searching with invalid guarantee timestamp") invalid_guarantee_time = get_invalid_guarantee_timestamp @@ -974,7 +970,7 @@ class TestCollectionSearchInvalid(TestcaseBase): expected: raise exception and report the error """ # 1. initialize with data - collection_w = self.init_collection_general(prefix, True, nb=10)[0] + collection_w = self.init_collection_general(prefix)[0] # 2. search log.info("test_search_invalid_round_decimal: Searching collection %s" % collection_w.name) collection_w.search(vectors[:default_nq], default_search_field, @@ -992,7 +988,7 @@ class TestCollectionSearchInvalid(TestcaseBase): expected: raise exception and report the error """ # 1. initialize with data - collection_w = self.init_collection_general(prefix, True, nb=10)[0] + collection_w = self.init_collection_general(prefix)[0] # 2. range search log.info("test_range_search_invalid_radius: Range searching collection %s" % collection_w.name) radius = get_invalid_range_search_paras @@ -1012,7 +1008,7 @@ class TestCollectionSearchInvalid(TestcaseBase): expected: raise exception and report the error """ # 1. initialize with data - collection_w = self.init_collection_general(prefix, True, nb=10)[0] + collection_w = self.init_collection_general(prefix)[0] # 2. range search log.info("test_range_search_invalid_range_filter: Range searching collection %s" % collection_w.name) range_filter = get_invalid_range_search_paras @@ -1032,7 +1028,7 @@ class TestCollectionSearchInvalid(TestcaseBase): expected: raise exception and report the error """ # 1. initialize with data - collection_w = self.init_collection_general(prefix, True, nb=10)[0] + collection_w = self.init_collection_general(prefix)[0] # 2. range search log.info("test_range_search_invalid_radius_range_filter_L2: Range searching collection %s" % collection_w.name) range_search_params = {"metric_type": "L2", "params": {"nprobe": 10, "radius": 1, "range_filter": 10}} @@ -1051,7 +1047,7 @@ class TestCollectionSearchInvalid(TestcaseBase): expected: raise exception and report the error """ # 1. initialize with data - collection_w = self.init_collection_general(prefix, True, nb=10)[0] + collection_w = self.init_collection_general(prefix)[0] # 2. range search log.info("test_range_search_invalid_radius_range_filter_IP: Range searching collection %s" % collection_w.name) range_search_params = {"metric_type": "IP", "params": {"nprobe": 10, "radius": 10, "range_filter": 1}} @@ -1167,7 +1163,7 @@ class TestCollectionSearchInvalid(TestcaseBase): expected: Raise exception """ # create collection, insert tmp_nb, flush and load - collection_w = self.init_collection_general(prefix, insert_data=True, + collection_w = self.init_collection_general(prefix, insert_data=True, nb=1, primary_field=ct.default_string_field_name, is_index=False, enable_dynamic_field=True)[0]