apache#10668 - Support case-insensitivity for column names in Partiti…

…onSpec Make PartitionSpec.Builder search for columns in a case-insensitive way, i.e. `"COLUMN_1" == "column_1"`
Teradata · Jul 10, 2024 · 486075c · 486075c
1 parent 1f6ff6c
commit 486075c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/api/src/main/java/org/apache/iceberg/PartitionSpec.java b/api/src/main/java/org/apache/iceberg/PartitionSpec.java
@@ -390,7 +390,7 @@ Builder checkConflicts(boolean check) {
     }
 
     private void checkAndAddPartitionName(String name, Integer sourceColumnId) {
-      Types.NestedField schemaField = schema.findField(name);
+      Types.NestedField schemaField = schema.caseInsensitiveFindField(name);
       if (checkConflicts) {
         if (sourceColumnId != null) {
           // for identity transform case we allow conflicts between partition and schema field name
@@ -433,7 +433,7 @@ public Builder withSpecId(int newSpecId) {
     }
 
     private Types.NestedField findSourceColumn(String sourceName) {
-      Types.NestedField sourceColumn = schema.findField(sourceName);
+      Types.NestedField sourceColumn = schema.caseInsensitiveFindField(sourceName);
       Preconditions.checkArgument(
           sourceColumn != null, "Cannot find source column: %s", sourceName);
       return sourceColumn;

diff --git a/core/src/test/java/org/apache/iceberg/TestPartitionSpecInfo.java b/core/src/test/java/org/apache/iceberg/TestPartitionSpecInfo.java
@@ -91,8 +91,20 @@ public void testSpecInfoPartitionedTable() {
     assertThat(table.spec()).isEqualTo(spec);
     assertThat(table.spec().lastAssignedFieldId()).isEqualTo(spec.lastAssignedFieldId());
     assertThat(table.specs())
-        .containsExactly(entry(spec.specId(), spec))
-        .doesNotContainKey(Integer.MAX_VALUE);
+            .containsExactly(entry(spec.specId(), spec))
+            .doesNotContainKey(Integer.MAX_VALUE);
+  }
+
+  @TestTemplate
+  public void testSpecInfoPartitionedTableCaseInsensitive() {
+    PartitionSpec spec = PartitionSpec.builderFor(schema).identity("DATA").build();
+    TestTables.TestTable table = TestTables.create(tableDir, "test", schema, spec, formatVersion);
+
+    assertThat(table.spec()).isEqualTo(spec);
+    assertThat(table.spec().lastAssignedFieldId()).isEqualTo(spec.lastAssignedFieldId());
+    assertThat(table.specs())
+            .containsExactly(entry(spec.specId(), spec))
+            .doesNotContainKey(Integer.MAX_VALUE);
   }
 
   @TestTemplate