Removed the ratelimitting for rows (will only be capped by the max ro…

…ws limit)
adsabs · Jul 5, 2019 · 1e5d648 · 1e5d648
1 parent 28bb9ab
commit 1e5d648
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/solr/tests/unittests/test_solr.py b/solr/tests/unittests/test_solr.py
@@ -263,8 +263,7 @@ def test_cleanup_params(self):
 
     def test_set_max_rows(self):
         """
-        solr should only return up to a default number of documents multiplied
-        by the user's ratelimit-level, if applicable
+        solr should only return up to a default number of documents
         """
         with MockSolrResponse(self.app.config.get('SOLR_SERVICE_SEARCH_HANDLER')):
 
@@ -286,7 +285,7 @@ def test_set_max_rows(self):
                 query_string={'q': '*', 'rows': 10},
                 headers={'X-Adsws-Ratelimit-Level': '10'}
             )
-            self.assertEqual(len(r.json['response']['docs']), 7)
+            self.assertEqual(len(r.json['response']['docs']), 2)
 
 
     def test_docs_subquery(self):

diff --git a/solr/views.py b/solr/views.py
@@ -144,9 +144,6 @@ def cleanup_solr_request(self, payload, user_id=None):
 
         payload['wt'] = 'json'
         max_rows = current_app.config.get('SOLR_SERVICE_MAX_ROWS', 100)
-        max_rows *= float(
-            request.headers.get('X-Adsws-Ratelimit-Level', 1.0)
-        )
         max_rows = int(max_rows)