PR#443: Remove unused cache class for results - greenwave

Lukas Holecek • 4 years ago

9ae56b2

greenwave/api_v1.py

file modified

-1

		`@@ -399,7 +399,6 @@`
		`verbose_waivers = []`
		`applicable_policies = []`
		`results_retriever = ResultsRetriever(`
		`- cache=current_app.cache,`
		`ignore_results=ignore_results,`
		`when=when,`
		`timeout=current_app.config['REQUESTS_TIMEOUT'],`

greenwave/consumers/resultsdb.py

file modified

-23

		`@@ -93,27 +93,6 @@`
		`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 @@`
		`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)`

greenwave/resources.py

file modified

+2 -21

		`@@ -30,30 +30,11 @@`
		`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`

greenwave/tests/test_policies.py

file modified

-1

		`@@ -28,7 +28,6 @@`
		`self, subject_identifier=None, testcase=None, outcome='PASSED',`
		`subject_type='koji_build'):`
		`super(DummyResultsRetriever, self).__init__(`
		`- cache=mock.Mock(),`
		`ignore_results=[],`
		`when='',`
		`timeout=0,`