commit 4aedec01f5030b36be1e8a07c65d15bd7b66d567
author Andrii Shyshkalov <tandrii@chromium.org> Mon Sep 17 16:31:17 2018 +0000
committer Commit Bot <commit-bot@chromium.org> Mon Sep 17 16:31:17 2018 +0000
tree b21ac58103bb4d9f46ac69a517756ef97867226d
parent 2174136d2520b2f030addb8466373f13f5badd39

my_activity: faster Gerrit reviews search.

Test: verified the same reviews list is produced w/o and w/ this change.
Change-Id: I72be85734a84d96a06b74515e64344fc203b1eed
Reviewed-on: https://chromium-review.googlesource.com/1227442
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>

my_activity.py

diff --git a/my_activity.py b/my_activity.py
index 3eebbb5..b732b0d 100755
--- a/my_activity.py
+++ b/my_activity.py
@@ -372,9 +372,12 @@
 
   def gerrit_search(self, instance, owner=None, reviewer=None):
     max_age = datetime.today() - self.modified_after
-    max_age = max_age.days * 24 * 3600 + max_age.seconds
-    user_filter = 'owner:%s' % owner if owner else 'reviewer:%s' % reviewer
-    filters = ['-age:%ss' % max_age, user_filter]
+    filters = ['-age:%ss' % (max_age.days * 24 * 3600 + max_age.seconds)]
+    if owner:
+      assert not reviewer
+      filters.append('owner:%s' % owner)
+    else:
+      filters.extend(('-owner:%s' % reviewer, 'reviewer:%s' % reviewer))
     # TODO(cjhopman): Should abandoned changes be filtered out when
     # merged_only is not enabled?
     if self.options.merged_only:
@@ -697,7 +700,6 @@
           gerrit_instances)
       rietveld_reviews = itertools.chain.from_iterable(rietveld_reviews.get())
       gerrit_reviews = itertools.chain.from_iterable(gerrit_reviews.get())
-      gerrit_reviews = [r for r in gerrit_reviews if not self.match(r['owner'])]
       self.reviews = list(rietveld_reviews) + list(gerrit_reviews)
 
   def print_reviews(self):