未验证 提交 55266d8d 编写于 作者: Y yanliang567 提交者: GitHub

Add partition_key tests (#24701)

Signed-off-by: Nyanliang567 <yanliang.qiao@zilliz.com>
上级 4048caa8
...@@ -124,23 +124,23 @@ def gen_double_field(name=ct.default_double_field_name, is_primary=False, descri ...@@ -124,23 +124,23 @@ def gen_double_field(name=ct.default_double_field_name, is_primary=False, descri
def gen_float_vec_field(name=ct.default_float_vec_field_name, is_primary=False, dim=ct.default_dim, def gen_float_vec_field(name=ct.default_float_vec_field_name, is_primary=False, dim=ct.default_dim,
description=ct.default_desc): description=ct.default_desc, **kwargs):
float_vec_field, _ = ApiFieldSchemaWrapper().init_field_schema(name=name, dtype=DataType.FLOAT_VECTOR, float_vec_field, _ = ApiFieldSchemaWrapper().init_field_schema(name=name, dtype=DataType.FLOAT_VECTOR,
description=description, dim=dim, description=description, dim=dim,
is_primary=is_primary) is_primary=is_primary, **kwargs)
return float_vec_field return float_vec_field
def gen_binary_vec_field(name=ct.default_binary_vec_field_name, is_primary=False, dim=ct.default_dim, def gen_binary_vec_field(name=ct.default_binary_vec_field_name, is_primary=False, dim=ct.default_dim,
description=ct.default_desc): description=ct.default_desc, **kwargs):
binary_vec_field, _ = ApiFieldSchemaWrapper().init_field_schema(name=name, dtype=DataType.BINARY_VECTOR, binary_vec_field, _ = ApiFieldSchemaWrapper().init_field_schema(name=name, dtype=DataType.BINARY_VECTOR,
description=description, dim=dim, description=description, dim=dim,
is_primary=is_primary) is_primary=is_primary, **kwargs)
return binary_vec_field return binary_vec_field
def gen_default_collection_schema(description=ct.default_desc, primary_field=ct.default_int64_field_name, def gen_default_collection_schema(description=ct.default_desc, primary_field=ct.default_int64_field_name,
auto_id=False, dim=ct.default_dim, enable_dynamic_field=False, with_json=True): auto_id=False, dim=ct.default_dim, enable_dynamic_field=False, with_json=True, **kwargs):
if enable_dynamic_field: if enable_dynamic_field:
if primary_field is ct.default_int64_field_name: if primary_field is ct.default_int64_field_name:
fields = [gen_int64_field(), gen_float_vec_field(dim=dim)] fields = [gen_int64_field(), gen_float_vec_field(dim=dim)]
...@@ -157,50 +157,50 @@ def gen_default_collection_schema(description=ct.default_desc, primary_field=ct. ...@@ -157,50 +157,50 @@ def gen_default_collection_schema(description=ct.default_desc, primary_field=ct.
schema, _ = ApiCollectionSchemaWrapper().init_collection_schema(fields=fields, description=description, schema, _ = ApiCollectionSchemaWrapper().init_collection_schema(fields=fields, description=description,
primary_field=primary_field, auto_id=auto_id, primary_field=primary_field, auto_id=auto_id,
enable_dynamic_field=enable_dynamic_field) enable_dynamic_field=enable_dynamic_field, **kwargs)
return schema return schema
def gen_general_collection_schema(description=ct.default_desc, primary_field=ct.default_int64_field_name, def gen_general_collection_schema(description=ct.default_desc, primary_field=ct.default_int64_field_name,
auto_id=False, is_binary=False, dim=ct.default_dim): auto_id=False, is_binary=False, dim=ct.default_dim, **kwargs):
if is_binary: if is_binary:
fields = [gen_int64_field(), gen_float_field(), gen_string_field(), gen_binary_vec_field(dim=dim)] fields = [gen_int64_field(), gen_float_field(), gen_string_field(), gen_binary_vec_field(dim=dim)]
else: else:
fields = [gen_int64_field(), gen_float_field(), gen_string_field(), gen_float_vec_field(dim=dim)] fields = [gen_int64_field(), gen_float_field(), gen_string_field(), gen_float_vec_field(dim=dim)]
schema, _ = ApiCollectionSchemaWrapper().init_collection_schema(fields=fields, description=description, schema, _ = ApiCollectionSchemaWrapper().init_collection_schema(fields=fields, description=description,
primary_field=primary_field, auto_id=auto_id) primary_field=primary_field, auto_id=auto_id, **kwargs)
return schema return schema
def gen_string_pk_default_collection_schema(description=ct.default_desc, primary_field=ct.default_string_field_name, def gen_string_pk_default_collection_schema(description=ct.default_desc, primary_field=ct.default_string_field_name,
auto_id=False, dim=ct.default_dim): auto_id=False, dim=ct.default_dim, **kwargs):
fields = [gen_int64_field(), gen_float_field(), gen_string_field(), gen_json_field(), gen_float_vec_field(dim=dim)] fields = [gen_int64_field(), gen_float_field(), gen_string_field(), gen_json_field(), gen_float_vec_field(dim=dim)]
schema, _ = ApiCollectionSchemaWrapper().init_collection_schema(fields=fields, description=description, schema, _ = ApiCollectionSchemaWrapper().init_collection_schema(fields=fields, description=description,
primary_field=primary_field, auto_id=auto_id) primary_field=primary_field, auto_id=auto_id, **kwargs)
return schema return schema
def gen_json_default_collection_schema(description=ct.default_desc, primary_field=ct.default_int64_field_name, def gen_json_default_collection_schema(description=ct.default_desc, primary_field=ct.default_int64_field_name,
auto_id=False, dim=ct.default_dim): auto_id=False, dim=ct.default_dim, **kwargs):
fields = [gen_int64_field(), gen_float_field(), gen_string_field(), gen_json_field(), gen_float_vec_field(dim=dim)] fields = [gen_int64_field(), gen_float_field(), gen_string_field(), gen_json_field(), gen_float_vec_field(dim=dim)]
schema, _ = ApiCollectionSchemaWrapper().init_collection_schema(fields=fields, description=description, schema, _ = ApiCollectionSchemaWrapper().init_collection_schema(fields=fields, description=description,
primary_field=primary_field, auto_id=auto_id) primary_field=primary_field, auto_id=auto_id, **kwargs)
return schema return schema
def gen_multiple_json_default_collection_schema(description=ct.default_desc, primary_field=ct.default_int64_field_name, def gen_multiple_json_default_collection_schema(description=ct.default_desc, primary_field=ct.default_int64_field_name,
auto_id=False, dim=ct.default_dim): auto_id=False, dim=ct.default_dim, **kwargs):
fields = [gen_int64_field(), gen_float_field(), gen_string_field(), gen_json_field(name="json1"), fields = [gen_int64_field(), gen_float_field(), gen_string_field(), gen_json_field(name="json1"),
gen_json_field(name="json2"), gen_float_vec_field(dim=dim)] gen_json_field(name="json2"), gen_float_vec_field(dim=dim)]
schema, _ = ApiCollectionSchemaWrapper().init_collection_schema(fields=fields, description=description, schema, _ = ApiCollectionSchemaWrapper().init_collection_schema(fields=fields, description=description,
primary_field=primary_field, auto_id=auto_id) primary_field=primary_field, auto_id=auto_id, **kwargs)
return schema return schema
def gen_collection_schema_all_datatype(description=ct.default_desc, def gen_collection_schema_all_datatype(description=ct.default_desc,
primary_field=ct.default_int64_field_name, primary_field=ct.default_int64_field_name,
auto_id=False, dim=ct.default_dim, auto_id=False, dim=ct.default_dim,
enable_dynamic_field=False, with_json=True): enable_dynamic_field=False, with_json=True, **kwargs):
if enable_dynamic_field: if enable_dynamic_field:
fields = [gen_int64_field(), gen_float_vec_field(dim=dim)] fields = [gen_int64_field(), gen_float_vec_field(dim=dim)]
else: else:
...@@ -211,22 +211,22 @@ def gen_collection_schema_all_datatype(description=ct.default_desc, ...@@ -211,22 +211,22 @@ def gen_collection_schema_all_datatype(description=ct.default_desc,
fields.remove(gen_json_field()) fields.remove(gen_json_field())
schema, _ = ApiCollectionSchemaWrapper().init_collection_schema(fields=fields, description=description, schema, _ = ApiCollectionSchemaWrapper().init_collection_schema(fields=fields, description=description,
primary_field=primary_field, auto_id=auto_id, primary_field=primary_field, auto_id=auto_id,
enable_dynamic_field=enable_dynamic_field) enable_dynamic_field=enable_dynamic_field, **kwargs)
return schema return schema
def gen_collection_schema(fields, primary_field=None, description=ct.default_desc, auto_id=False): def gen_collection_schema(fields, primary_field=None, description=ct.default_desc, auto_id=False, **kwargs):
schema, _ = ApiCollectionSchemaWrapper().init_collection_schema(fields=fields, primary_field=primary_field, schema, _ = ApiCollectionSchemaWrapper().init_collection_schema(fields=fields, primary_field=primary_field,
description=description, auto_id=auto_id) description=description, auto_id=auto_id, **kwargs)
return schema return schema
def gen_default_binary_collection_schema(description=ct.default_desc, primary_field=ct.default_int64_field_name, def gen_default_binary_collection_schema(description=ct.default_desc, primary_field=ct.default_int64_field_name,
auto_id=False, dim=ct.default_dim): auto_id=False, dim=ct.default_dim, **kwargs):
fields = [gen_int64_field(), gen_float_field(), gen_string_field(), gen_binary_vec_field(dim=dim)] fields = [gen_int64_field(), gen_float_field(), gen_string_field(), gen_binary_vec_field(dim=dim)]
binary_schema, _ = ApiCollectionSchemaWrapper().init_collection_schema(fields=fields, description=description, binary_schema, _ = ApiCollectionSchemaWrapper().init_collection_schema(fields=fields, description=description,
primary_field=primary_field, primary_field=primary_field,
auto_id=auto_id) auto_id=auto_id, **kwargs)
return binary_schema return binary_schema
......
此差异已折叠。
...@@ -183,7 +183,7 @@ class TestResourceGroupParams(TestcaseBase): ...@@ -183,7 +183,7 @@ class TestResourceGroupParams(TestcaseBase):
check_task=ct.CheckTasks.check_rg_property, check_task=ct.CheckTasks.check_rg_property,
check_items={"name": rg_name}) check_items={"name": rg_name})
error = {ct.err_code: 999, error = {ct.err_code: 999,
ct.err_msg: "failed to create resource group, err=resource group already exist"} ct.err_msg: "resource group already exist"}
self.init_resource_group(name=rg_name, self.init_resource_group(name=rg_name,
check_task=ct.CheckTasks.err_res, check_task=ct.CheckTasks.err_res,
check_items=error) check_items=error)
...@@ -243,7 +243,7 @@ class TestResourceGroupParams(TestcaseBase): ...@@ -243,7 +243,7 @@ class TestResourceGroupParams(TestcaseBase):
rgs = self.utility_wrap.list_resource_groups()[0] rgs = self.utility_wrap.list_resource_groups()[0]
assert len(rgs) == max_rg_num assert len(rgs) == max_rg_num
error = {ct.err_code: 999, ct.err_msg: 'failed to create resource group, err=resource group num reach limit'} error = {ct.err_code: 999, ct.err_msg: 'resource group num reach limit'}
self.init_resource_group(name=cf.gen_unique_str('rg'), self.init_resource_group(name=cf.gen_unique_str('rg'),
check_task=CheckTasks.err_res, check_task=CheckTasks.err_res,
check_items=error) check_items=error)
...@@ -577,7 +577,7 @@ class TestTransferNode(TestcaseBase): ...@@ -577,7 +577,7 @@ class TestTransferNode(TestcaseBase):
check_items=default_rg_info) check_items=default_rg_info)
@pytest.mark.tags(CaseLabel.MultiQueryNodes) @pytest.mark.tags(CaseLabel.MultiQueryNodes)
@pytest.mark.parametrize("num_node", [0, 99, -1, 0.5, True, "str"]) @pytest.mark.parametrize("num_node", [0, 99, -1, 0.5, "str"])
def test_transfer_node_with_wrong_num_node(self, num_node): def test_transfer_node_with_wrong_num_node(self, num_node):
""" """
Method: Method:
...@@ -1426,7 +1426,7 @@ class TestResourceGroupMultiNodes(TestcaseBase): ...@@ -1426,7 +1426,7 @@ class TestResourceGroupMultiNodes(TestcaseBase):
rgB_name = cf.gen_unique_str('rgB') rgB_name = cf.gen_unique_str('rgB')
self.init_resource_group(name=rgB_name) self.init_resource_group(name=rgB_name)
# transfer 1 nodes to rgA, 2 nodes to rgB # transfer 2 nodes to rgA, 3 nodes to rgB
self.utility_wrap.transfer_node(source=ct.default_resource_group_name, self.utility_wrap.transfer_node(source=ct.default_resource_group_name,
target=rgA_name, target=rgA_name,
num_node=2) num_node=2)
...@@ -1509,7 +1509,7 @@ class TestResourceGroupMultiNodes(TestcaseBase): ...@@ -1509,7 +1509,7 @@ class TestResourceGroupMultiNodes(TestcaseBase):
) )
# wait transfer completed for replicas # wait transfer completed for replicas
time.sleep(60) time.sleep(120)
# make growing # make growing
if with_growing: if with_growing:
res, _ = collection_w.insert(cf.gen_default_list_data(nb, dim=dim, start=7 * nb)) res, _ = collection_w.insert(cf.gen_default_list_data(nb, dim=dim, start=7 * nb))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册