Bugfix - int overflow on maxrec calculation

Author: juanmcloaiza

astroquery/eso/core.py

@@ -223,22 +223,15 @@ def _get_auth_header(self) -> Dict[str, str]:
         else:
             return {}
 
-    def _maybe_warn_about_table_length(self, table_rowlim_plus_one):
+    def _maybe_warn_about_table_length(self, table_rowlim_plus_one, row_limit_plus_one):
         """
         Issues a warning when a table is empty or when the
         results are truncated
         """
         if len(table_rowlim_plus_one) < 1:
             warnings.warn("Query returned no results", NoResultsWarning)
 
-        # Just adding this case for clarification:
-        if len(table_rowlim_plus_one) == self.ROW_LIMIT:
-            # We asked for a table with ROW_LIMIT + 1 rows, and got a table with ROW_LIMIT rows.
-            # This means the table was not truncated, ROW_LIMIT coincides with the table length.
-            pass
-
-        if len(table_rowlim_plus_one) == 1 + self.ROW_LIMIT:
-            # The table has more than ROW_LIMIT rows, which means it will be artificially truncated.
+        if len(table_rowlim_plus_one) == row_limit_plus_one:
             warnings.warn(f"Results truncated to {self.ROW_LIMIT}. "
                           "To retrieve all the records set to None the ROW_LIMIT attribute",
                           MaxResultsWarning)
@@ -256,8 +249,12 @@ def message(query_str):
                     f' >>> Eso().query_tap( "{query_str}" )\n\n')
 
         try:
-            table_with_an_extra_row = tap.search(query=query_str, maxrec=self.ROW_LIMIT+1).to_table()
-            self._maybe_warn_about_table_length(table_with_an_extra_row)
+            row_limit_plus_one = self.ROW_LIMIT
+            if self.ROW_LIMIT < sys.maxsize:
+                row_limit_plus_one = self.ROW_LIMIT + 1
+
+            table_with_an_extra_row = tap.search(query=query_str, maxrec=row_limit_plus_one).to_table()
+            self._maybe_warn_about_table_length(table_with_an_extra_row, row_limit_plus_one)
         except DALQueryError:
             log.error(message(query_str))
         except DALFormatError as e:

astroquery/eso/tests/test_eso_remote.py

@@ -35,12 +35,23 @@
                 'HAWKI',
                 'KMOS',
                 'MW-BULGE-PSFPHOT',
+                'SEDIGISM',
                 'VPHASplus',
                 'VVV',
                 'VVVX',
                 'XSHOOTER'
                 ]
 
+ONE_RECORD_SURVEYS = [
+    '081.C-0827',
+    '108.2289',
+    '1100.A-0528',
+    '60.A-9493',
+    'APEX-SciOps',
+    'HARPS',
+    'LESS',
+]
+
 
 @pytest.mark.remote_data
 class TestEso:
@@ -275,14 +286,20 @@ def test_each_survey_sgrastar(self, tmp_path):
 
         surveys = eso.list_surveys()
         for survey in surveys:
-            if survey in SGRA_SURVEYS:
-                with pytest.warns(MaxResultsWarning):
+            if survey in SGRA_SURVEYS:  # survey contains SGRA
+                if survey not in ONE_RECORD_SURVEYS:  # Expect warnings
+                    with pytest.warns(MaxResultsWarning):
+                        result_s = eso.query_surveys(
+                            surveys=survey,
+                            cone_ra=266.41681662, cone_dec=-29.00782497, cone_radius=0.1775)
+                else:  # No warnings expected
                     result_s = eso.query_surveys(
                         surveys=survey,
                         cone_ra=266.41681662, cone_dec=-29.00782497, cone_radius=0.1775)
+
                 assert isinstance(result_s, Table)
                 assert len(result_s) > 0
-            else:
+            else:  # survey does not contain SGRA
                 with pytest.warns(NoResultsWarning):
                     result_s = eso.query_surveys(surveys=survey, cone_ra=266.41681662,
                                                  cone_dec=-29.00782497,
@@ -291,12 +308,15 @@ def test_each_survey_sgrastar(self, tmp_path):
                     assert isinstance(result_s, Table)
                     assert len(result_s) == 0, f"Failed for survey {survey}"
 
-                with pytest.warns(MaxResultsWarning):
-                    generic_result = eso.query_surveys(surveys=survey)
+                if survey not in ONE_RECORD_SURVEYS:  # Expect warnings
+                    with pytest.warns(MaxResultsWarning):
+                        generic_result = eso.query_surveys(surveys=survey)
 
-                    assert isinstance(generic_result, Table)
-                    assert len(generic_result) > 0, \
-                        f"query_surveys({survey}) returned no records"
+                else:  # Do not expect warnings
+                    generic_result = eso.query_surveys(surveys=survey)
+                assert isinstance(generic_result, Table)
+                assert len(generic_result) > 0, \
+                    f"query_surveys({survey}) returned no records"
 
     @pytest.mark.filterwarnings("ignore::pyvo.dal.exceptions.DALOverflowWarning")
     def test_mixed_case_instrument(self, tmp_path):