optimization: 任务历史搜索优化 (closed #1856) #1915
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ping15
force-pushed
the
_v2.4.x/dev_issue#1856
branch
from
2cf65a2
to
52d9351
Compare
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## v2.4.4-dev #1915 +/- ##
==============================================
+ Coverage 74.96% 74.99% +0.02%
==============================================
Files 403 403
Lines 27856 27890 +34
==============================================
+ Hits 20883 20916 +33
- Misses 6973 6974 +1 ☔ View full report in Codecov by Sentry. |
自测
不带bk_biz_scope(即用户全部业务，使用admin测试)
单业务
中间数量业务
全业务
带时间过滤
单业务
中间业务
全业务
|
apps/node_man/serializers/meta.py
Outdated
|
|
||
| class FilterConditionSerializer(serializers.Serializer): | ||
| category = serializers.CharField(label=_("分类"), required=False, default="") | ||
| bk_biz_ids = serializers.ListField(label=_("业务列表"), required=False, default=[]) |
| @@ -58,11 +62,13 @@ def fetch_cloud_unique_col_count(self, col): | |||
| """ | |||
| return Cloud.objects.values_list(col, flat=True).distinct().count() | |||
|
|
|||
| def fetch_Job_unique_col_count(self): | |||
| def fetch_Job_unique_col_count(self, search_business=None): | |||
apps/node_man/tools/job.py
Outdated
| def get_job_queryset_with_biz_scope(cls, all_biz_info, biz_info, biz_permission, search_biz_ids, kwargs): | ||
| """ | ||
| 根据用户所拥有的业务权限进行Job的筛选 | ||
| :param all_biz_info: 所有的业务id |
apps/node_man/tools/job.py
Outdated
| # 业务权限 | ||
| if search_biz_ids: | ||
| # 字典的 in 比列表性能更高 | ||
| biz_scope = [bk_biz_id for bk_biz_id in search_biz_ids if bk_biz_id in biz_info] |
There was a problem hiding this comment.
等价操作：set(biz_permission) & set(search_biz_id)
apps/node_man/tools/job.py
Outdated
| biz_scope_query_q = Q() | ||
| elif need_reverse_query: | ||
| biz_scope_query_q = reduce( | ||
| operator.and_, [Q(bk_biz_scope__contains=bk_biz_id) for bk_biz_id in biz_scope], Q() |
There was a problem hiding this comment.
not A and not B and not C = not (A or B or C)
| "start_time": "2023-10-01 12:00:00", | ||
| "end_time": "2023-10-03 12:00:00", | ||
| }, | ||
| { |
| self.assertEqual(result, [ | ||
| {"name": _("任务ID"), "id": "job_id"}, | ||
| {"name": _("IP"), "id": "inner_ip_list"}, | ||
| ]) |
ping15
force-pushed
the
_v2.4.x/dev_issue#1856
branch
4 times, most recently
from
5e7cf8c
to
626e387
Compare
apps/node_man/tools/job.py
Outdated
| """ | ||
| # 业务权限 | ||
| if search_biz_ids: | ||
| # 字典的 in 比列表性能更高 |
ping15
force-pushed
the
_v2.4.x/dev_issue#1856
branch
11 times, most recently
from
72bf7a8
to
db90d74
Compare
ZhuoZhuoCrayon
requested changes
Nov 17, 2023
| @@ -73,13 +79,28 @@ def fetch_Job_unique_col_count(self): | |||
|
|
|||
| for job in job_condition: | |||
| # 判断权限 | |||
| if set(job["bk_biz_scope"]) - {biz["bk_biz_id"] for biz in SEARCH_BUSINESS} == set(): | |||
| if any(biz_id in {biz["bk_biz_id"] for biz in search_business} for biz_id in set(job["bk_biz_scope"])): | |||
There was a problem hiding this comment.
虽然是测试代码，但最好把一些公共变量放到 for 循环外面，避免占用内存
set(job["bk_biz_scope"]){biz["bk_biz_id"] for biz in search_business}
ping15
force-pushed
the
_v2.4.x/dev_issue#1856
branch
from
db90d74
to
16f1d03
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR
CheckList（PR Assigners）
确认已完成以下操作：
backlog->todo->for test->tested（需通过测试同学测试）->donepr/reviewableCheckList（PR Reviewers）
确认已完成以下操作：
pr/reviewable，要求重新修改