Leave out non-current Iceberg columns and do not retry twice

Glue keeps an Iceberg table's dropped and renamed columns, marked
iceberg.field.current=false, which Athena's GetTableMetadata leaves out.
Measured after DROP COLUMN and CHANGE COLUMN; the Glue path now matches.

A first attempt that failed on a code its policy already retried is not
retried again with the full policy; only a MetadataException the first
attempt left out is. HasTableTest caught the doubled retries.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: laughingman7743

pyathena/common.py

@@ -353,8 +353,11 @@ def _route_after_athena_failure(
         if _get_error_code(cause, unwrap_metadata=True) in THROTTLING_ERROR_CODES:
             _logger.warning(f"Request to {description} was throttled; reading it from Glue.")
             return True
-        # The first attempt left out MetadataException, which the policy may retry.
-        if is_retryable_error(cause, self._retry_config):
+        # The first attempt left out MetadataException, which the policy may retry;
+        # a code it did retry has already had its retries.
+        if is_retryable_error(cause, self._retry_config) and not is_retryable_error(
+            cause, self._glue_first_attempt_retry_config()
+        ):
             return False
         if logging_:
             _logger.exception(f"Failed to {description}.")

pyathena/glue.py

@@ -90,6 +90,8 @@ def table_metadata(table: Mapping[str, Any]) -> AthenaTableMetadata:
         location and formats are always present, the SerDe library whenever
         the descriptor has SerDe information, and SerDe parameters with a
         ``serde.param.`` prefix. The Glue description is not the table comment.
+        Glue keeps an Iceberg table's dropped and renamed columns, marked as
+        not current, which Athena leaves out.
 
         Args:
             table: A ``Table`` from a Glue ``GetTable`` or ``GetTables`` response.
@@ -119,7 +121,11 @@ def column(c: Mapping[str, Any]) -> dict[str, Any]:
                     "CreateTime": table.get("CreateTime"),
                     "LastAccessTime": table.get("LastAccessTime"),
                     "TableType": table.get("TableType"),
-                    "Columns": [column(c) for c in descriptor.get("Columns") or []],
+                    "Columns": [
+                        column(c)
+                        for c in descriptor.get("Columns") or []
+                        if (c.get("Parameters") or {}).get("iceberg.field.current") != "false"
+                    ],
                     "PartitionKeys": [column(c) for c in table.get("PartitionKeys") or []],
                     "Parameters": parameters,
                 }

tests/pyathena/test_glue.py

@@ -72,6 +72,34 @@ def test_requests_address_the_catalog(self, catalog_name, catalog_kwargs):
             ("get_databases", catalog_kwargs),
         ]
 
+    def test_table_metadata_leaves_out_columns_iceberg_no_longer_has(self):
+        # Glue's columns after DROP COLUMN b and CHANGE COLUMN a a2, as measured
+        # for #786; Athena reports a2, c and d.
+        def column(name, current):
+            return {
+                "Name": name,
+                "Type": "int",
+                "Parameters": {"iceberg.field.current": current, "iceberg.field.id": "1"},
+            }
+
+        table = {
+            "Name": "t",
+            "Parameters": {"table_type": "ICEBERG"},
+            "StorageDescriptor": {
+                "Columns": [
+                    column("a2", "true"),
+                    column("c", "true"),
+                    column("d", "true"),
+                    column("a", "false"),
+                    column("b", "false"),
+                ]
+            },
+        }
+
+        metadata = GlueMetadataCatalog.table_metadata(table)
+
+        assert [c.name for c in metadata.columns] == ["a2", "c", "d"]
+
     @pytest.mark.parametrize(
         ("table", "expected_parameters"),
         [