dramaticlly commented on code in PR #13645: URL: https://github.com/apache/iceberg/pull/13645#discussion_r2226429687
########## core/src/test/java/org/apache/iceberg/RewriteTablePathUtilTest.java: ########## @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.iceberg; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.Test; + +public class RewriteTablePathUtilTest { + + @Test + public void testStagingPathPreservesDirectoryStructure() { + String sourcePrefix = "/source/table"; + String stagingDir = "/staging/"; + + // Two files with same name but different paths + String file1 = "/source/table/hash1/delete_0_0_0.parquet"; + String file2 = "/source/table/hash2/delete_0_0_0.parquet"; + + String stagingPath1 = RewriteTablePathUtil.stagingPath(file1, sourcePrefix, stagingDir); + String stagingPath2 = RewriteTablePathUtil.stagingPath(file2, sourcePrefix, stagingDir); + + // Should preserve directory structure to avoid conflicts + assertThat(stagingPath1).isEqualTo("/staging/hash1/delete_0_0_0.parquet"); + assertThat(stagingPath2).isEqualTo("/staging/hash2/delete_0_0_0.parquet"); + + // Verify they are different despite having the same filename + assertThat(stagingPath1).isNotEqualTo(stagingPath2); + } + + @Test + public void testStagingPathBackwardCompatibility() { + // Test that the deprecated method still works + String originalPath = "/some/path/file.parquet"; + String stagingDir = "/staging/"; + + String result = RewriteTablePathUtil.stagingPath(originalPath, stagingDir); Review Comment: can we also add a test where there's no middle part and assert both new method and old method behave the same? ########## core/src/main/java/org/apache/iceberg/RewriteTablePathUtil.java: ########## @@ -693,8 +693,24 @@ public static String maybeAppendFileSeparator(String path) { * @param originalPath source path * @param stagingDir staging directory * @return a staging path under the staging directory, based on the original path + * @deprecated Use {@link #stagingPath(String, String, String)} instead to avoid filename conflicts Review Comment: for deprecation of public method, can you add a version hint? You can find it like LINE299 above `* @deprecated since 1.10.0, will be removed in 1.11.0` ########## core/src/test/java/org/apache/iceberg/RewriteTablePathUtilTest.java: ########## @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.iceberg; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.Test; + +public class RewriteTablePathUtilTest { + + @Test + public void testStagingPathPreservesDirectoryStructure() { + String sourcePrefix = "/source/table"; + String stagingDir = "/staging/"; + + // Two files with same name but different paths + String file1 = "/source/table/hash1/delete_0_0_0.parquet"; + String file2 = "/source/table/hash2/delete_0_0_0.parquet"; + + String stagingPath1 = RewriteTablePathUtil.stagingPath(file1, sourcePrefix, stagingDir); + String stagingPath2 = RewriteTablePathUtil.stagingPath(file2, sourcePrefix, stagingDir); + + // Should preserve directory structure to avoid conflicts + assertThat(stagingPath1).isEqualTo("/staging/hash1/delete_0_0_0.parquet"); + assertThat(stagingPath2).isEqualTo("/staging/hash2/delete_0_0_0.parquet"); Review Comment: nit: maybe consider ```java assertThat(stagingPath1) .startsWith(stagingDir) .isEqualTo("/staging/hash1/delete_0_0_0.parquet") .isNotEqualTo(stagingPath2) ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
