From 9ae56b26a65546e4d8319637e4610abc96307e9c Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Jun 17 2019 06:26:29 +0000 Subject: Remove unused cache class for results Signed-off-by: Lukas Holecek --- diff --git a/greenwave/api_v1.py b/greenwave/api_v1.py index 38088d7..1e07a6b 100644 --- a/greenwave/api_v1.py +++ b/greenwave/api_v1.py @@ -399,7 +399,6 @@ def make_decision(): verbose_waivers = [] applicable_policies = [] results_retriever = ResultsRetriever( - cache=current_app.cache, ignore_results=ignore_results, when=when, timeout=current_app.config['REQUESTS_TIMEOUT'], diff --git a/greenwave/consumers/resultsdb.py b/greenwave/consumers/resultsdb.py index d4a1d3b..65138eb 100644 --- a/greenwave/consumers/resultsdb.py +++ b/greenwave/consumers/resultsdb.py @@ -93,27 +93,6 @@ def _subject_product_version(subject_identifier, subject_type, koji_base_url=Non pass -def _invalidate_results_cache( - cache, subject_type, subject_identifier, testcase): - """ - Removes results for given parameters from cache. - """ - key = greenwave.resources.results_cache_key( - subject_type, subject_identifier, testcase) - - log.debug("Invalidating cache for %r", key) - - try: - cache.delete(key) - except KeyError: - log.debug("No cache value found for %r", key) - - # Also invalidate query results without test case name. - if testcase: - _invalidate_results_cache( - cache, subject_type, subject_identifier, testcase=None) - - def _equals_except_keys(lhs, rhs, except_keys): keys = lhs.keys() - except_keys return lhs.keys() == rhs.keys() \ @@ -253,8 +232,6 @@ class ResultsDBHandler(fedmsg.consumers.FedmsgConsumer): with self.flask_app.app_context(): for subject_type, subject_identifier in self.announcement_subjects(message): log.debug('Considering subject %s: %r', subject_type, subject_identifier) - _invalidate_results_cache( - self.cache, subject_type, subject_identifier, testcase) self._publish_decision_changes(subject_type, subject_identifier, submit_time, testcase) diff --git a/greenwave/resources.py b/greenwave/resources.py index 56a5496..c24feed 100644 --- a/greenwave/resources.py +++ b/greenwave/resources.py @@ -30,30 +30,11 @@ requests_session = requests.Session() requests_session.headers["User-Agent"] = f"greenwave {__version__}" -class CachedResults(object): - """ - Results data in cache. - """ - def __init__(self): - self.results = [] - self.can_fetch_more = True - self.last_page = -1 - - -def results_cache_key(subject_type, subject_identifier, testcase): - """ - Returns cache key for results for given parameters. - """ - return "greenwave.resources:CachedResults|{} {} {}".format( - subject_type, subject_identifier, testcase) - - class ResultsRetriever(object): """ - Retrieves results from cache or ResultsDB. + Retrieves results from ResultsDB. """ - def __init__(self, cache, ignore_results, when, timeout, verify, url): - self.cache = cache + def __init__(self, ignore_results, when, timeout, verify, url): self.ignore_results = ignore_results self.when = when self.timeout = timeout diff --git a/greenwave/tests/test_policies.py b/greenwave/tests/test_policies.py index 36a7a2b..847e014 100644 --- a/greenwave/tests/test_policies.py +++ b/greenwave/tests/test_policies.py @@ -28,7 +28,6 @@ class DummyResultsRetriever(ResultsRetriever): self, subject_identifier=None, testcase=None, outcome='PASSED', subject_type='koji_build'): super(DummyResultsRetriever, self).__init__( - cache=mock.Mock(), ignore_results=[], when='', timeout=0,