Update tests

apache · Jan 30, 2025 · 760ed7d · 760ed7d
1 parent 75114f1
commit 760ed7d
Show file tree

Hide file tree

Showing 15 changed files with 198 additions and 131 deletions.
diff --git a/api/src/main/java/org/apache/iceberg/Accessors.java b/api/src/main/java/org/apache/iceberg/Accessors.java
@@ -232,6 +232,11 @@ public Map<Integer, Accessor<StructLike>> struct(
       return accessors;
     }
 
+    @Override
+    public Map<Integer, Accessor<StructLike>> variant() {
+      return null;
+    }
+
     @Override
     public Map<Integer, Accessor<StructLike>> field(
         Types.NestedField field, Map<Integer, Accessor<StructLike>> fieldResult) {

diff --git a/api/src/main/java/org/apache/iceberg/types/GetProjectedIds.java b/api/src/main/java/org/apache/iceberg/types/GetProjectedIds.java
@@ -74,4 +74,9 @@ public Set<Integer> map(Types.MapType map, Set<Integer> keyResult, Set<Integer>
     }
     return fieldIds;
   }
+
+  @Override
+  public Set<Integer> variant() {
+    return null;
+  }
 }
diff --git a/api/src/main/java/org/apache/iceberg/types/IndexById.java b/api/src/main/java/org/apache/iceberg/types/IndexById.java
@@ -64,4 +64,9 @@ public Map<Integer, Types.NestedField> map(
     }
     return null;
   }
+
+  @Override
+  public Map<Integer, Types.NestedField> variant() {
+    return null;
+  }
 }
diff --git a/api/src/main/java/org/apache/iceberg/types/PruneColumns.java b/api/src/main/java/org/apache/iceberg/types/PruneColumns.java
@@ -159,6 +159,11 @@ public Type map(Types.MapType map, Type ignored, Type valueResult) {
     return null;
   }
 
+  @Override
+  public Type variant() {
+    return null;
+  }
+
   @Override
   public Type primitive(Type.PrimitiveType primitive) {
     return null;

diff --git a/api/src/main/java/org/apache/iceberg/types/TypeUtil.java b/api/src/main/java/org/apache/iceberg/types/TypeUtil.java
@@ -617,7 +617,7 @@ public T map(Types.MapType map, T keyResult, T valueResult) {
     }
 
     public T variant() {
-      return null;
+      throw new UnsupportedOperationException("Unsupported type: variant");
     }
 
     public T primitive(Type.PrimitiveType primitive) {

diff --git a/api/src/main/java/org/apache/iceberg/types/Types.java b/api/src/main/java/org/apache/iceberg/types/Types.java
@@ -39,8 +39,8 @@ public class Types {
 
   private Types() {}
 
-  private static final ImmutableMap<String, PrimitiveType> TYPES =
-      ImmutableMap.<String, PrimitiveType>builder()
+  private static final ImmutableMap<String, Type> TYPES =
+      ImmutableMap.<String, Type>builder()
           .put(BooleanType.get().toString(), BooleanType.get())
           .put(IntegerType.get().toString(), IntegerType.get())
           .put(LongType.get().toString(), LongType.get())
@@ -56,21 +56,14 @@ private Types() {}
           .put(UUIDType.get().toString(), UUIDType.get())
           .put(BinaryType.get().toString(), BinaryType.get())
           .put(UnknownType.get().toString(), UnknownType.get())
+          .put(VariantType.get().toString(), VariantType.get())
           .buildOrThrow();
 
   private static final Pattern FIXED = Pattern.compile("fixed\\[\\s*(\\d+)\\s*\\]");
   private static final Pattern DECIMAL =
       Pattern.compile("decimal\\(\\s*(\\d+)\\s*,\\s*(\\d+)\\s*\\)");
 
-  public static Type typeFromTypeString(String typeString) {
-    if (VariantType.get().toString().equalsIgnoreCase(typeString)) {
-      return Types.VariantType.get();
-    }
-
-    return Types.fromPrimitiveString(typeString);
-  }
-
-  public static PrimitiveType fromPrimitiveString(String typeString) {
+  public static Type fromPrimitiveString(String typeString) {
     String lowerTypeString = typeString.toLowerCase(Locale.ROOT);
     if (TYPES.containsKey(lowerTypeString)) {
       return TYPES.get(lowerTypeString);