[IcebergIO] Support TableIdentifiers with special characters (#38876)

ahmedabu98 · web-flow · commit 20ed72c83e3a · 2026-07-13T17:41:45.000-05:00
diff --git a/.github/trigger_files/IO_Iceberg_Integration_Tests.json b/.github/trigger_files/IO_Iceberg_Integration_Tests.json
@@ -1,4 +1,4 @@
 {
     "comment": "Modify this file in a trivial way to cause this test suite to run.",
-    "modification": 1
+    "modification": 2
 }
diff --git a/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/AddFiles.java b/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/AddFiles.java
@@ -523,7 +523,7 @@ static <W, T> T transformValue(Transform<W, T> transform, Type type, ByteBuffer
     }
 
     private Table getOrCreateTable(String filePath, FileFormat format) throws IOException {
-      TableIdentifier tableId = TableIdentifier.parse(identifier);
+      TableIdentifier tableId = IcebergUtils.parseTableIdentifier(identifier);
       try {
         return catalogConfig.catalog().loadTable(tableId);
       } catch (NoSuchTableException e) {
@@ -549,7 +549,7 @@ private Table getOrCreateTable(String filePath, FileFormat format) throws IOExce
               .create();
 
         } catch (AlreadyExistsException e2) { // if table already exists, just load it
-          return catalogConfig.catalog().loadTable(TableIdentifier.parse(identifier));
+          return catalogConfig.catalog().loadTable(IcebergUtils.parseTableIdentifier(identifier));
         }
       }
     }
@@ -684,7 +684,7 @@ public void process(
         return;
       }
       if (table == null) {
-        table = catalogConfig.catalog().loadTable(TableIdentifier.parse(identifier));
+        table = catalogConfig.catalog().loadTable(IcebergUtils.parseTableIdentifier(identifier));
       }
 
       PartitionSpec spec = checkStateNotNull(table.specs().get(batch.getKey()));
@@ -769,7 +769,7 @@ public void process(
       }
       String commitId = commitHash(manifests);
       if (table == null) {
-        table = catalogConfig.catalog().loadTable(TableIdentifier.parse(identifier));
+        table = catalogConfig.catalog().loadTable(IcebergUtils.parseTableIdentifier(identifier));
       }
       table.refresh();
       ensureNameMappingPresent(table);
diff --git a/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/AppendFilesToTables.java b/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/AppendFilesToTables.java
@@ -47,7 +47,6 @@
 import org.apache.iceberg.Snapshot;
 import org.apache.iceberg.Table;
 import org.apache.iceberg.catalog.Catalog;
-import org.apache.iceberg.catalog.TableIdentifier;
 import org.apache.iceberg.io.FileIO;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.slf4j.Logger;
@@ -75,7 +74,7 @@ public PCollection<KV<String, SnapshotInfo>> expand(PCollection<FileWriteResult>
                 new SerializableFunction<FileWriteResult, String>() {
                   @Override
                   public String apply(FileWriteResult input) {
-                    return input.getTableIdentifier().toString();
+                    return IcebergUtils.tableIdentifierToString(input.getTableIdentifier());
                   }
                 }))
         .apply("Group metadata updates by table", GroupByKey.create())
@@ -128,7 +127,7 @@ public void processElement(
         BoundedWindow window)
         throws IOException {
       String tableStringIdentifier = element.getKey();
-      Table table = getCatalog().loadTable(TableIdentifier.parse(element.getKey()));
+      Table table = getCatalog().loadTable(IcebergUtils.parseTableIdentifier(element.getKey()));
       Iterable<FileWriteResult> fileWriteResults = element.getValue();
       if (shouldSkip(table, fileWriteResults)) {
         return;
diff --git a/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/AssignDestinationsAndPartitions.java b/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/AssignDestinationsAndPartitions.java
@@ -35,7 +35,6 @@
 import org.apache.iceberg.PartitionKey;
 import org.apache.iceberg.PartitionSpec;
 import org.apache.iceberg.Schema;
-import org.apache.iceberg.catalog.TableIdentifier;
 import org.apache.iceberg.exceptions.NoSuchTableException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -149,7 +148,7 @@ public void processElement(
             // see if table already exists with a spec
             spec =
                 TableCache.getAndRefreshIfStale(
-                        catalogConfig, TableIdentifier.parse(tableIdentifier))
+                        catalogConfig, IcebergUtils.parseTableIdentifier(tableIdentifier))
                     .spec();
 
           } catch (NoSuchTableException ignored) {
diff --git a/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/FileWriteResult.java b/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/FileWriteResult.java
@@ -44,7 +44,7 @@ abstract class FileWriteResult {
   @SchemaIgnore
   public TableIdentifier getTableIdentifier() {
     if (cachedTableIdentifier == null) {
-      cachedTableIdentifier = TableIdentifier.parse(getTableIdentifierString());
+      cachedTableIdentifier = IcebergUtils.parseTableIdentifier(getTableIdentifierString());
     }
     return cachedTableIdentifier;
   }
@@ -70,7 +70,7 @@ abstract static class Builder {
 
     @SchemaIgnore
     public Builder setTableIdentifier(TableIdentifier tableId) {
-      return setTableIdentifierString(tableId.toString());
+      return setTableIdentifierString(IcebergUtils.tableIdentifierToString(tableId));
     }
 
     public abstract FileWriteResult build();
diff --git a/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/IcebergCatalogConfig.java b/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/IcebergCatalogConfig.java
@@ -155,7 +155,7 @@ public void createTable(
       Schema tableSchema,
       @Nullable List<String> partitionFields,
       @Nullable Map<String, String> properties) {
-    TableIdentifier icebergIdentifier = TableIdentifier.parse(tableIdentifier);
+    TableIdentifier icebergIdentifier = IcebergUtils.parseTableIdentifier(tableIdentifier);
     org.apache.iceberg.Schema icebergSchema = IcebergUtils.beamSchemaToIcebergSchema(tableSchema);
     PartitionSpec icebergSpec = PartitionUtils.toPartitionSpec(partitionFields, tableSchema);
     try {
@@ -178,7 +178,7 @@ public void createTable(
   }
 
   public @Nullable IcebergTableInfo loadTable(String tableIdentifier) {
-    TableIdentifier icebergIdentifier = TableIdentifier.parse(tableIdentifier);
+    TableIdentifier icebergIdentifier = IcebergUtils.parseTableIdentifier(tableIdentifier);
     try {
       Table table = catalog().loadTable(icebergIdentifier);
       return new IcebergTableInfo(tableIdentifier, table);
@@ -270,7 +270,7 @@ public void updatePartitionSpec(
   }
 
   public boolean dropTable(String tableIdentifier) {
-    TableIdentifier icebergIdentifier = TableIdentifier.parse(tableIdentifier);
+    TableIdentifier icebergIdentifier = IcebergUtils.parseTableIdentifier(tableIdentifier);
     return catalog().dropTable(icebergIdentifier);
   }
 
diff --git a/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/IcebergCdcReadSchemaTransformProvider.java b/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/IcebergCdcReadSchemaTransformProvider.java
@@ -41,7 +41,6 @@
 import org.apache.beam.sdk.values.Row;
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Enums;
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Optional;
-import org.apache.iceberg.catalog.TableIdentifier;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.joda.time.Duration;
 
@@ -109,7 +108,7 @@ public PCollectionRowTuple expand(PCollectionRowTuple input) {
       IcebergIO.ReadRows readRows =
           IcebergIO.readRows(configuration.getIcebergCatalog())
               .withCdc()
-              .from(TableIdentifier.parse(configuration.getTable()))
+              .from(IcebergUtils.parseTableIdentifier(configuration.getTable()))
               .fromSnapshot(configuration.getFromSnapshot())
               .toSnapshot(configuration.getToSnapshot())
               .fromTimestamp(configuration.getFromTimestamp())
diff --git a/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/IcebergReadSchemaTransformProvider.java b/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/IcebergReadSchemaTransformProvider.java
@@ -37,7 +37,6 @@
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.beam.sdk.values.PCollectionRowTuple;
 import org.apache.beam.sdk.values.Row;
-import org.apache.iceberg.catalog.TableIdentifier;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
@@ -93,7 +92,7 @@ public PCollectionRowTuple expand(PCollectionRowTuple input) {
               .getPipeline()
               .apply(
                   IcebergIO.readRows(configuration.getIcebergCatalog())
-                      .from(TableIdentifier.parse(configuration.getTable()))
+                      .from(IcebergUtils.parseTableIdentifier(configuration.getTable()))
                       .keeping(configuration.getKeep())
                       .dropping(configuration.getDrop())
                       .withFilter(configuration.getFilter()));
diff --git a/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/IcebergScanConfig.java b/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/IcebergScanConfig.java
@@ -80,7 +80,9 @@ public enum ScanType {
   @Pure
   public Table getTable() {
     if (cachedTable == null) {
-      cachedTable = TableCache.get(getCatalogConfig(), TableIdentifier.parse(getTableIdentifier()));
+      cachedTable =
+          TableCache.get(
+              getCatalogConfig(), IcebergUtils.parseTableIdentifier(getTableIdentifier()));
     }
     return cachedTable;
   }
@@ -294,7 +296,7 @@ public abstract static class Builder {
     public abstract Builder setTableIdentifier(String tableIdentifier);
 
     public Builder setTableIdentifier(TableIdentifier tableIdentifier) {
-      return this.setTableIdentifier(tableIdentifier.toString());
+      return this.setTableIdentifier(IcebergUtils.tableIdentifierToString(tableIdentifier));
     }
 
     public Builder setTableIdentifier(String... names) {
diff --git a/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/IcebergUtils.java b/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/IcebergUtils.java
@@ -46,6 +46,8 @@
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.annotations.VisibleForTesting;
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableMap;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.catalog.TableIdentifierParser;
 import org.apache.iceberg.data.GenericRecord;
 import org.apache.iceberg.data.Record;
 import org.apache.iceberg.types.Type;
@@ -631,6 +633,58 @@ private static Object getLogicalTypeValue(Object icebergValue, Schema.FieldType
     return icebergValue;
   }
 
+  /** Serializes a table identifier without losing dots or other special characters in each part. */
+  public static String tableIdentifierToString(TableIdentifier tableIdentifier) {
+    TableIdentifier identifier = checkArgumentNotNull(tableIdentifier);
+    return requiresJsonTableIdentifier(identifier)
+        ? TableIdentifierParser.toJson(identifier)
+        : identifier.toString();
+  }
+
+  /** Parses either Iceberg's JSON table identifier representation or the legacy dotted form. */
+  public static TableIdentifier parseTableIdentifier(String table) {
+    if (looksLikeJsonObject(table)) {
+      return TableIdentifierParser.fromJson(table);
+    }
+
+    return TableIdentifier.parse(table);
+  }
+
+  private static boolean looksLikeJsonObject(@Nullable String value) {
+    if (value == null) {
+      return false;
+    }
+
+    int start = 0;
+    while (start < value.length() && Character.isWhitespace(value.charAt(start))) {
+      start++;
+    }
+    if (start == value.length() || value.charAt(start) != '{') {
+      return false;
+    }
+
+    int end = value.length() - 1;
+    while (end >= 0 && Character.isWhitespace(value.charAt(end))) {
+      end--;
+    }
+
+    return end >= 0 && value.charAt(end) == '}';
+  }
+
+  private static boolean requiresJsonTableIdentifier(TableIdentifier identifier) {
+    if (looksLikeJsonObject(identifier.toString())) {
+      return true;
+    }
+
+    for (String level : identifier.namespace().levels()) {
+      if (level.contains(".")) {
+        return true;
+      }
+    }
+
+    return identifier.name().contains(".");
+  }
+
   static <T> boolean isUnbounded(PCollection<T> input) {
     return input.isBounded().equals(PCollection.IsBounded.UNBOUNDED);
   }
diff --git a/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/IncrementalScanSource.java b/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/IncrementalScanSource.java
@@ -33,7 +33,6 @@
 import org.apache.beam.sdk.values.Row;
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.MoreObjects;
 import org.apache.iceberg.Table;
-import org.apache.iceberg.catalog.TableIdentifier;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.joda.time.Duration;
 
@@ -54,7 +53,8 @@ class IncrementalScanSource extends PTransform<PBegin, PCollection<Row>> {
   public PCollection<Row> expand(PBegin input) {
     Table table =
         TableCache.get(
-            scanConfig.getCatalogConfig(), TableIdentifier.parse(scanConfig.getTableIdentifier()));
+            scanConfig.getCatalogConfig(),
+            IcebergUtils.parseTableIdentifier(scanConfig.getTableIdentifier()));
 
     PCollection<KV<String, List<SnapshotInfo>>> snapshots =
         MoreObjects.firstNonNull(scanConfig.getStreaming(), false)
diff --git a/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/OneTableDynamicDestinations.java b/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/OneTableDynamicDestinations.java
@@ -41,13 +41,13 @@ class OneTableDynamicDestinations implements DynamicDestinations, Externalizable
   @VisibleForTesting
   TableIdentifier getTableIdentifier() {
     if (tableId == null) {
-      tableId = TableIdentifier.parse(checkStateNotNull(tableIdString));
+      tableId = IcebergUtils.parseTableIdentifier(checkStateNotNull(tableIdString));
     }
     return tableId;
   }
 
   OneTableDynamicDestinations(TableIdentifier tableId, Schema rowSchema) {
-    this.tableIdString = tableId.toString();
+    this.tableIdString = IcebergUtils.tableIdentifierToString(tableId);
     this.rowSchema = rowSchema;
   }
 
@@ -86,6 +86,6 @@ public void writeExternal(ObjectOutput out) throws IOException {
   @Override
   public void readExternal(ObjectInput in) throws IOException {
     tableIdString = in.readUTF();
-    tableId = TableIdentifier.parse(tableIdString);
+    tableId = IcebergUtils.parseTableIdentifier(tableIdString);
   }
 }
diff --git a/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/PortableIcebergDestinations.java b/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/PortableIcebergDestinations.java
@@ -25,7 +25,6 @@
 import org.apache.beam.sdk.values.Row;
 import org.apache.beam.sdk.values.ValueInSingleWindow;
 import org.apache.iceberg.FileFormat;
-import org.apache.iceberg.catalog.TableIdentifier;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 class PortableIcebergDestinations implements DynamicDestinations {
@@ -84,7 +83,7 @@ public String getTableStringIdentifier(ValueInSingleWindow<Row> element) {
   @Override
   public IcebergDestination instantiateDestination(String dest) {
     return IcebergDestination.builder()
-        .setTableIdentifier(TableIdentifier.parse(dest))
+        .setTableIdentifier(IcebergUtils.parseTableIdentifier(dest))
         .setTableCreateConfig(
             IcebergTableCreateConfig.builder()
                 .setSchema(getDataSchema())
diff --git a/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/SnapshotInfo.java b/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/SnapshotInfo.java
@@ -94,7 +94,8 @@ public static Builder builder() {
   @SchemaIgnore
   public TableIdentifier getTableIdentifier() {
     if (cachedTableIdentifier == null) {
-      cachedTableIdentifier = TableIdentifier.parse(checkStateNotNull(getTableIdentifierString()));
+      cachedTableIdentifier =
+          IcebergUtils.parseTableIdentifier(checkStateNotNull(getTableIdentifierString()));
     }
     return cachedTableIdentifier;
   }
diff --git a/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/TableCache.java b/sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/TableCache.java
@@ -55,7 +55,7 @@ public static Table get(IcebergCatalogConfig catalogConfig, TableIdentifier iden
 
   /** Returns the cached table for a string identifier, loading it on a cache miss. */
   public static Table get(IcebergCatalogConfig catalogConfig, String identifier) {
-    return get(catalogConfig, TableIdentifier.parse(identifier));
+    return get(catalogConfig, IcebergUtils.parseTableIdentifier(identifier));
   }
 
   /** Returns the cached table, using the given loader only on a cache miss. */
@@ -75,11 +75,11 @@ public static Table getRefreshed(IcebergCatalogConfig catalogConfig, TableIdenti
 
   /** Returns the cached table for a string identifier after refreshing any pre-existing entry. */
   public static Table getRefreshed(IcebergCatalogConfig catalogConfig, String identifier) {
-    return getRefreshed(catalogConfig, TableIdentifier.parse(identifier));
+    return getRefreshed(catalogConfig, IcebergUtils.parseTableIdentifier(identifier));
   }
 
   public static Table getAndRefreshIfStale(IcebergCatalogConfig catalogConfig, String identifier) {
-    return getAndRefreshIfStale(catalogConfig, TableIdentifier.parse(identifier));
+    return getAndRefreshIfStale(catalogConfig, IcebergUtils.parseTableIdentifier(identifier));
   }
 
   /**
diff --git a/sdks/java/io/iceberg/src/test/java/org/apache/beam/sdk/io/iceberg/IcebergIOReadTest.java b/sdks/java/io/iceberg/src/test/java/org/apache/beam/sdk/io/iceberg/IcebergIOReadTest.java
@@ -341,7 +341,8 @@ public void testProjectedSchemaWithNestedFields() {
   @Test
   public void testSimpleScan() throws Exception {
     TableIdentifier tableId =
-        TableIdentifier.of("default", "table" + Long.toString(UUID.randomUUID().hashCode(), 16));
+        TableIdentifier.of(
+            "default", "table.with.dots" + Long.toString(UUID.randomUUID().hashCode(), 16));
     Table simpleTable = warehouse.createTable(tableId, schemaForMode(TestFixtures.SCHEMA, 1));
     final Schema schema = icebergSchemaToBeamSchema(simpleTable.schema());
 
diff --git a/sdks/java/io/iceberg/src/test/java/org/apache/beam/sdk/io/iceberg/IcebergIOWriteTest.java b/sdks/java/io/iceberg/src/test/java/org/apache/beam/sdk/io/iceberg/IcebergIOWriteTest.java
@@ -148,7 +148,8 @@ private IcebergIO.WriteRows applyDistribution(IcebergIO.WriteRows write) {
   @Test
   public void testSimpleAppend() throws Exception {
     TableIdentifier tableId =
-        TableIdentifier.of("default", "table" + Long.toString(UUID.randomUUID().hashCode(), 16));
+        TableIdentifier.of(
+            "default", "table.with.dots" + Long.toString(UUID.randomUUID().hashCode(), 16));
 
     Map<String, String> catalogProps =
         ImmutableMap.<String, String>builder()
diff --git a/sdks/java/io/iceberg/src/test/java/org/apache/beam/sdk/io/iceberg/IcebergUtilsTest.java b/sdks/java/io/iceberg/src/test/java/org/apache/beam/sdk/io/iceberg/IcebergUtilsTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"comment": "Modify this file in a trivial way to cause this test suite to run.",`
`3`		`- "modification": 1`
	`3`	`+ "modification": 2`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,7 @@ static <W, T> T transformValue(Transform<W, T> transform, Type type, ByteBuffer`
`523`	`523`	`}`
`524`	`524`
`525`	`525`	`private Table getOrCreateTable(String filePath, FileFormat format) throws IOException {`
`526`		`- TableIdentifier tableId = TableIdentifier.parse(identifier);`
	`526`	`+ TableIdentifier tableId = IcebergUtils.parseTableIdentifier(identifier);`
`527`	`527`	`try {`
`528`	`528`	`return catalogConfig.catalog().loadTable(tableId);`
`529`	`529`	`} catch (NoSuchTableException e) {`
`@@ -549,7 +549,7 @@ private Table getOrCreateTable(String filePath, FileFormat format) throws IOExce`
`549`	`549`	`.create();`
`550`	`550`
`551`	`551`	`} catch (AlreadyExistsException e2) { // if table already exists, just load it`
`552`		`- return catalogConfig.catalog().loadTable(TableIdentifier.parse(identifier));`
	`552`	`+ return catalogConfig.catalog().loadTable(IcebergUtils.parseTableIdentifier(identifier));`
`553`	`553`	`}`
`554`	`554`	`}`
`555`	`555`	`}`
`@@ -684,7 +684,7 @@ public void process(`
`684`	`684`	`return;`
`685`	`685`	`}`
`686`	`686`	`if (table == null) {`
`687`		`- table = catalogConfig.catalog().loadTable(TableIdentifier.parse(identifier));`
	`687`	`+ table = catalogConfig.catalog().loadTable(IcebergUtils.parseTableIdentifier(identifier));`
`688`	`688`	`}`
`689`	`689`
`690`	`690`	`PartitionSpec spec = checkStateNotNull(table.specs().get(batch.getKey()));`
`@@ -769,7 +769,7 @@ public void process(`
`769`	`769`	`}`
`770`	`770`	`String commitId = commitHash(manifests);`
`771`	`771`	`if (table == null) {`
`772`		`- table = catalogConfig.catalog().loadTable(TableIdentifier.parse(identifier));`
	`772`	`+ table = catalogConfig.catalog().loadTable(IcebergUtils.parseTableIdentifier(identifier));`
`773`	`773`	`}`
`774`	`774`	`table.refresh();`
`775`	`775`	`ensureNameMappingPresent(table);`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ abstract class FileWriteResult {`
`44`	`44`	`@SchemaIgnore`
`45`	`45`	`public TableIdentifier getTableIdentifier() {`
`46`	`46`	`if (cachedTableIdentifier == null) {`
`47`		`- cachedTableIdentifier = TableIdentifier.parse(getTableIdentifierString());`
	`47`	`+ cachedTableIdentifier = IcebergUtils.parseTableIdentifier(getTableIdentifierString());`
`48`	`48`	`}`
`49`	`49`	`return cachedTableIdentifier;`
`50`	`50`	`}`
`@@ -70,7 +70,7 @@ abstract static class Builder {`
`70`	`70`
`71`	`71`	`@SchemaIgnore`
`72`	`72`	`public Builder setTableIdentifier(TableIdentifier tableId) {`
`73`		`- return setTableIdentifierString(tableId.toString());`
	`73`	`+ return setTableIdentifierString(IcebergUtils.tableIdentifierToString(tableId));`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`public abstract FileWriteResult build();`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,9 @@ public enum ScanType {`
`80`	`80`	`@Pure`
`81`	`81`	`public Table getTable() {`
`82`	`82`	`if (cachedTable == null) {`
`83`		`- cachedTable = TableCache.get(getCatalogConfig(), TableIdentifier.parse(getTableIdentifier()));`
	`83`	`+ cachedTable =`
	`84`	`+ TableCache.get(`
	`85`	`+ getCatalogConfig(), IcebergUtils.parseTableIdentifier(getTableIdentifier()));`
`84`	`86`	`}`
`85`	`87`	`return cachedTable;`
`86`	`88`	`}`
`@@ -294,7 +296,7 @@ public abstract static class Builder {`
`294`	`296`	`public abstract Builder setTableIdentifier(String tableIdentifier);`
`295`	`297`
`296`	`298`	`public Builder setTableIdentifier(TableIdentifier tableIdentifier) {`
`297`		`- return this.setTableIdentifier(tableIdentifier.toString());`
	`299`	`+ return this.setTableIdentifier(IcebergUtils.tableIdentifierToString(tableIdentifier));`
`298`	`300`	`}`
`299`	`301`
`300`	`302`	`public Builder setTableIdentifier(String... names) {`