github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #10694 from jumpserver/pr@dev@perf_acls_filter 

perf: 优化 json m2m field 正向查询
pull/10698/head
老广 2023-06-13 13:50:31 +08:00 committed by GitHub
parent 9f4cb2e790 7e9d1fc945
commit db3fca0409
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/common/db/fields.py
View File

@ -442,9 +442,7 @@ class JSONManyToManyDescriptor:
# 自定义的情况：比如 nodes, category # 自定义的情况：比如 nodes, category
res = True res = True
to_model = apps.get_model(self.field.to) to_model = apps.get_model(self.field.to)
src_model = self.field.model custom_attr_filter = getattr(to_model, "get_json_filter_attr_q", None)
field_name = self.field.name
custom_attr_filter = getattr(src_model, "get_filter_{}_attr_q".format(field_name), None)
custom_q = Q() custom_q = Q()
for rule in attr_rules: for rule in attr_rules:
@ -510,14 +508,23 @@ class JSONManyToManyDescriptor:
return res return res
def get_filter_q(self, instance): def get_filter_q(self, instance):
"""
这个是某个 instance 获取 关联 资源的 filter q
:param instance:
:return:
"""
model_cls = self.field.model model_cls = self.field.model
field_name = self.field.column field_name = self.field.column
q = Q(**{f'{field_name}__type': 'all'}) | \ q = Q(**{f'{field_name}__type': 'all'}) | \
Q(**{f'{field_name}__type': 'ids', f'{field_name}__ids__contains': [str(instance.id)]}) Q(**{
f'{field_name}__type': 'ids',
f'{field_name}__ids__contains': [str(instance.id)]
})
queryset_id_attrs = model_cls.objects \ queryset_id_attrs = model_cls.objects \
.filter(**{'{}__type'.format(field_name): 'attrs'}) \ .filter(**{'{}__type'.format(field_name): 'attrs'}) \
.values_list('id', '{}__attrs'.format(field_name)) .values_list('id', '{}__attrs'.format(field_name))
ids = [str(_id) for _id, attr_rules in queryset_id_attrs if self.is_match(instance, attr_rules)] ids = [str(_id) for _id, attr_rules in queryset_id_attrs
if self.is_match(instance, attr_rules)]
if ids: if ids:
q |= Q(id__in=ids) q |= Q(id__in=ids)
return q return q