From a82d4832fcab61382ca204fa52631640ec7d9b41 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Mar 31 2020 14:01:46 +0000 Subject: Reduce memory used for rules, see #728 --- diff --git a/rules/copr-build-01.yml b/rules/copr-build-01.yml index 28ddf96..16a1e83 100644 --- a/rules/copr-build-01.yml +++ b/rules/copr-build-01.yml @@ -25,7 +25,7 @@ criteria: - "%(msg.user)s" # The user that was created. rows_per_page: 9999999 operation: - lambda: len([msg for msg in query.all() if msg.msg['status'] is 1]) + lambda: sum(1 for msg in query.all() if msg.msg['status'] is 1) condition: greater than or equal to: 1 diff --git a/rules/copr-build-02.yml b/rules/copr-build-02.yml index 7099a9a..8ba312e 100644 --- a/rules/copr-build-02.yml +++ b/rules/copr-build-02.yml @@ -25,7 +25,7 @@ criteria: - "%(msg.user)s" # The user that was created. rows_per_page: 9999999 operation: - lambda: len([msg for msg in query.all() if msg.msg['status'] is 1]) + lambda: sum(1 for msg in query.all() if msg.msg['status'] is 1) condition: greater than or equal to: 20 diff --git a/rules/copr-build-03.yml b/rules/copr-build-03.yml index ed89e67..6803e74 100644 --- a/rules/copr-build-03.yml +++ b/rules/copr-build-03.yml @@ -25,7 +25,7 @@ criteria: - "%(msg.user)s" # The user that was created. rows_per_page: 9999999 operation: - lambda: len([msg for msg in query.all() if msg.msg['status'] is 1]) + lambda: sum(1 for msg in query.all() if msg.msg['status'] is 1) condition: greater than or equal to: 60 diff --git a/rules/copr-build-04.yml b/rules/copr-build-04.yml index 5b9f70b..80e270a 100644 --- a/rules/copr-build-04.yml +++ b/rules/copr-build-04.yml @@ -25,7 +25,7 @@ criteria: - "%(msg.user)s" # The user that was created. rows_per_page: 9999999 operation: - lambda: len([msg for msg in query.all() if msg.msg['status'] is 1]) + lambda: sum(1 for msg in query.all() if msg.msg['status'] is 1) condition: greater than or equal to: 90 diff --git a/rules/copr-build-05.yml b/rules/copr-build-05.yml index e0a6605..5feb572 100644 --- a/rules/copr-build-05.yml +++ b/rules/copr-build-05.yml @@ -25,7 +25,7 @@ criteria: - "%(msg.user)s" # The user that was created. rows_per_page: 9999999 operation: - lambda: len([msg for msg in query.all() if msg.msg['status'] is 1]) + lambda: sum(1 for msg in query.all() if msg.msg['status'] is 1) condition: greater than or equal to: 150 diff --git a/rules/copr-build-06.yml b/rules/copr-build-06.yml index 1eace5e..76e4d5b 100644 --- a/rules/copr-build-06.yml +++ b/rules/copr-build-06.yml @@ -25,7 +25,7 @@ criteria: - "%(msg.user)s" # The user that was created. rows_per_page: 9999999 operation: - lambda: len([msg for msg in query.all() if msg.msg['status'] is 1]) + lambda: sum(1 for msg in query.all() if msg.msg['status'] is 1) condition: greater than or equal to: 300 diff --git a/rules/copr-build-07.yml b/rules/copr-build-07.yml index 33eaacb..85611d1 100644 --- a/rules/copr-build-07.yml +++ b/rules/copr-build-07.yml @@ -25,7 +25,7 @@ criteria: - "%(msg.user)s" # The user that was created. rows_per_page: 9999999 operation: - lambda: len([msg for msg in query.all() if msg.msg['status'] is 1]) + lambda: sum(1 for msg in query.all() if msg.msg['status'] is 1) condition: greater than or equal to: 999 diff --git a/rules/packager-karma-01.yml b/rules/packager-karma-01.yml index 38e8317..0dd8a0a 100644 --- a/rules/packager-karma-01.yml +++ b/rules/packager-karma-01.yml @@ -30,7 +30,7 @@ criteria: # - "%(msg.comment.update_submitter)s" rows_per_page: 9999999 operation: - lambda: len([msg for msg in query.all() if msg.msg['comment'].get('update', {}).get('user', {}).get('name', None) == "%(msg.comment.update.user.name)s" and msg.msg['comment']['karma'] is 1]) + lambda: sum(1 for msg in query.all() if msg.msg['comment'].get('update', {}).get('user', {}).get('name', None) == "%(msg.comment.update.user.name)s" and msg.msg['comment']['karma'] is 1) condition: greater than or equal to: 1 diff --git a/rules/packager-karma-02.yml b/rules/packager-karma-02.yml index a5a74e4..438c48b 100644 --- a/rules/packager-karma-02.yml +++ b/rules/packager-karma-02.yml @@ -30,7 +30,7 @@ criteria: # - "%(msg.comment.update_submitter)s" rows_per_page: 9999999 operation: - lambda: len([msg for msg in query.all() if msg.msg['comment'].get('update', {}).get('user', {}).get('name', None) == "%(msg.comment.update.user.name)s" and msg.msg['comment']['karma'] is 1]) + lambda: sum(1 for msg in query.all() if msg.msg['comment'].get('update', {}).get('user', {}).get('name', None) == "%(msg.comment.update.user.name)s" and msg.msg['comment']['karma'] is 1) condition: greater than or equal to: 10 diff --git a/rules/packager-karma-03.yml b/rules/packager-karma-03.yml index 96c1aad..00a998e 100644 --- a/rules/packager-karma-03.yml +++ b/rules/packager-karma-03.yml @@ -30,7 +30,7 @@ criteria: # - "%(msg.comment.update_submitter)s" rows_per_page: 9999999 operation: - lambda: len([msg for msg in query.all() if msg.msg['comment'].get('update', {}).get('user', {}).get('name', None) == "%(msg.comment.update.user.name)s" and msg.msg['comment']['karma'] is 1]) + lambda: sum(1 for msg in query.all() if msg.msg['comment'].get('update', {}).get('user', {}).get('name', None) == "%(msg.comment.update.user.name)s" and msg.msg['comment']['karma'] is 1) condition: greater than or equal to: 50 diff --git a/rules/packager-karma-04.yml b/rules/packager-karma-04.yml index ac9a41a..9943e54 100644 --- a/rules/packager-karma-04.yml +++ b/rules/packager-karma-04.yml @@ -30,7 +30,7 @@ criteria: # - "%(msg.comment.update_submitter)s" rows_per_page: 9999999 operation: - lambda: len([msg for msg in query.all() if msg.msg['comment'].get('update', {}).get('user', {}).get('name', None) == "%(msg.comment.update.user.name)s" and msg.msg['comment']['karma'] is 1]) + lambda: sum(1 for msg in query.all() if msg.msg['comment'].get('update', {}).get('user', {}).get('name', None) == "%(msg.comment.update.user.name)s" and msg.msg['comment']['karma'] is 1) condition: greater than or equal to: 100