You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by et...@apache.org on 2025/02/28 10:29:58 UTC
(iceberg) branch main updated: API: Fix IndexOutOfBounds exception in FileFormat#fromFileName (#12301)
This is an automated email from the ASF dual-hosted git repository.
etudenhoefner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/main by this push:
new 6a7999b58e API: Fix IndexOutOfBounds exception in FileFormat#fromFileName (#12301)
6a7999b58e is described below
commit 6a7999b58e9f8eae0f86569f3dcd4f57ec557996
Author: Willi Raschkowski <wr...@palantir.com>
AuthorDate: Fri Feb 28 10:29:53 2025 +0000
API: Fix IndexOutOfBounds exception in FileFormat#fromFileName (#12301)
---
.../main/java/org/apache/iceberg/FileFormat.java | 11 +++-
.../java/org/apache/iceberg/TestFileFormat.java | 67 ++++++++++++++++++++++
2 files changed, 75 insertions(+), 3 deletions(-)
diff --git a/api/src/main/java/org/apache/iceberg/FileFormat.java b/api/src/main/java/org/apache/iceberg/FileFormat.java
index 6b41aec42c..064fc1465f 100644
--- a/api/src/main/java/org/apache/iceberg/FileFormat.java
+++ b/api/src/main/java/org/apache/iceberg/FileFormat.java
@@ -58,11 +58,16 @@ public enum FileFormat {
}
public static FileFormat fromFileName(CharSequence filename) {
+ if (filename == null) {
+ return null;
+ }
+
for (FileFormat format : VALUES) {
int extStart = filename.length() - format.ext.length();
- if (Comparators.charSequences()
- .compare(format.ext, filename.subSequence(extStart, filename.length()))
- == 0) {
+ if (extStart > 0
+ && Comparators.charSequences()
+ .compare(format.ext, filename.subSequence(extStart, filename.length()))
+ == 0) {
return format;
}
}
diff --git a/api/src/test/java/org/apache/iceberg/TestFileFormat.java b/api/src/test/java/org/apache/iceberg/TestFileFormat.java
new file mode 100644
index 0000000000..19aa1d882e
--- /dev/null
+++ b/api/src/test/java/org/apache/iceberg/TestFileFormat.java
@@ -0,0 +1,67 @@
+/*
+ * 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.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.FieldSource;
+
+@SuppressWarnings("unused")
+class TestFileFormat {
+
+ private static final Object[][] FILE_NAMES =
+ new Object[][] {
+ // Files with format
+ {"file.puffin", FileFormat.PUFFIN},
+ {"dir/file.puffin", FileFormat.PUFFIN},
+ {"file.orc", FileFormat.ORC},
+ {"dir/file.orc", FileFormat.ORC},
+ {"file.parquet", FileFormat.PARQUET},
+ {"dir/file.parquet", FileFormat.PARQUET},
+ {"file.avro", FileFormat.AVRO},
+ {"dir/file.avro", FileFormat.AVRO},
+ {"v1.metadata.json", FileFormat.METADATA},
+ {"dir/v1.metadata.json", FileFormat.METADATA},
+ // Short file names with format
+ {"x.puffin", FileFormat.PUFFIN},
+ {"x.orc", FileFormat.ORC},
+ {"x.parquet", FileFormat.PARQUET},
+ {"x.avro", FileFormat.AVRO},
+ {"x.metadata.json", FileFormat.METADATA},
+ // Unsupported formats
+ {"file.csv", null},
+ {"dir/file.csv", null},
+ // No format
+ {"file", null},
+ {"dir", null},
+ // Blank strings
+ {"", null},
+ {" ", null},
+ {null, null},
+ };
+
+ @ParameterizedTest
+ @FieldSource("FILE_NAMES")
+ void fromFileName(String fileName, FileFormat expected) {
+ FileFormat actual = FileFormat.fromFileName(fileName);
+
+ assertThat(actual).isEqualTo(expected);
+ }
+}