Use Iceberg default name mapping

trinodb · Dec 2, 2021 · 9d6fb5e · 9d6fb5e
1 parent a9fa389
commit 9d6fb5e
Show file tree

Hide file tree

Showing 6 changed files with 273 additions and 64 deletions.
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java
@@ -72,6 +72,7 @@
 import org.apache.iceberg.SchemaParser;
 import org.apache.iceberg.Snapshot;
 import org.apache.iceberg.Table;
+import org.apache.iceberg.TableProperties;
 import org.apache.iceberg.TableScan;
 import org.apache.iceberg.Transaction;
 import org.apache.iceberg.io.CloseableIterable;
@@ -181,14 +182,16 @@ public IcebergTableHandle getTableHandle(ConnectorSession session, SchemaTableNa
         }
         Optional<Long> snapshotId = getSnapshotId(table, name.getSnapshotId());
 
+        String nameMappingJson = table.properties().get(TableProperties.DEFAULT_NAME_MAPPING);
         return new IcebergTableHandle(
                 tableName.getSchemaName(),
                 name.getTableName(),
                 name.getTableType(),
                 snapshotId,
                 TupleDomain.all(),
                 TupleDomain.all(),
-                ImmutableSet.of());
+                ImmutableSet.of(),
+                Optional.ofNullable(nameMappingJson));
     }
 
     @Override
@@ -732,7 +735,8 @@ public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(C
                         table.getSnapshotId(),
                         newUnenforcedConstraint,
                         newEnforcedConstraint,
-                        table.getProjectedColumns()),
+                        table.getProjectedColumns(),
+                        table.getNameMappingJson()),
                 remainingConstraint.transformKeys(ColumnHandle.class::cast),
                 false));
     }