Skip to content

Core: Treat path prefixes as literals in RewriteTablePathUtil.replacePaths #17521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uros-b wants to merge 1 commit into
base: main
Choose a base branch
from
+42 −1
Open

Core: Treat path prefixes as literals in RewriteTablePathUtil.replacePaths #17521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/RewriteTablePathUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public Set<Pair<String, String>> copyPlan() {
*/
public static TableMetadata replacePaths(
TableMetadata metadata, String sourcePrefix, String targetPrefix) {
String newLocation = metadata.location().replaceFirst(sourcePrefix, targetPrefix);
String newLocation = newPath(metadata.location(), sourcePrefix, targetPrefix);
List<Snapshot> newSnapshots = updatePathInSnapshots(metadata, sourcePrefix, targetPrefix);
List<TableMetadata.MetadataLogEntry> metadataLogEntries =
updatePathInMetadataLogs(metadata, sourcePrefix, targetPrefix);
Expand Down
41 changes: 41 additions & 0 deletions core/src/test/java/org/apache/iceberg/TestRewriteTablePathUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,47 @@ public void testNewPathBackupRestore() {
.isEqualTo("/table");
}

@Test
public void testReplacePathsTreatsPrefixAsLiteral() {
// Prefixes are literal paths, not regular expressions. A prefix containing regex
// metacharacters must match only itself.
String sourcePrefix = "s3://bucket/warehouse.db/table";
String targetPrefix = "s3://bucket/restored.db/table";
TableMetadata metadata =
TableMetadata.newTableMetadata(
SCHEMA, PartitionSpec.unpartitioned(), sourcePrefix, ImmutableMap.of());

TableMetadata replaced =
RewriteTablePathUtil.replacePaths(metadata, sourcePrefix, targetPrefix);
assertThat(replaced.location()).isEqualTo(targetPrefix);

// The '.' in the source prefix must not match an arbitrary character, so a location that
// only matches when the prefix is read as a regex is rejected.
TableMetadata unrelated =
TableMetadata.newTableMetadata(
SCHEMA,
PartitionSpec.unpartitioned(),
"s3://bucket/warehouseXdb/table",
ImmutableMap.of());
assertThatThrownBy(
() -> RewriteTablePathUtil.replacePaths(unrelated, sourcePrefix, targetPrefix))
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("does not start with");
}

@Test
public void testReplacePathsWithTrailingSeparatorInPrefix() {
// A source prefix with a trailing separator still matches the table location.
String location = "s3://bucket/warehouse/table";
TableMetadata metadata =
TableMetadata.newTableMetadata(
SCHEMA, PartitionSpec.unpartitioned(), location, ImmutableMap.of());

TableMetadata replaced =
RewriteTablePathUtil.replacePaths(metadata, location + "/", "s3://bucket/restored/table");
assertThat(replaced.location()).isEqualTo("s3://bucket/restored/table");
}

@Test
public void testNewPathTableRename() {
// Rename /tableX to /table (target is substring of source name)
Expand Down
Loading